diff --git a/blocks/columns/columns.css b/blocks/columns/columns.css
index 9ff1403..b5a4f52 100644
--- a/blocks/columns/columns.css
+++ b/blocks/columns/columns.css
@@ -1,6 +1,7 @@
 .columns > div {
   display: flex;
   flex-direction: column;
+  gap: 30px;
 }
 
 .columns img {
@@ -19,15 +20,32 @@
   display: block;
 }
 
+.columns > div > div > *:last-child {
+  margin-bottom: 0;
+}
+
+@media (width >= 768px) {
+  .columns > div {
+    flex-flow: row wrap;
+    gap: 30px;
+    justify-content: center;
+  }
+
+  .columns > div > div {
+    width: calc(50% - 15px);
+  }
+}
+
 @media (width >= 960px) {
   .columns > div {
     align-items: flex-start;
-    flex-direction: unset;
+    flex-wrap: nowrap;
     gap: 40px;
   }
 
   .columns > div > div {
     flex: 1;
     order: unset;
+    width: auto;
   }
 }
diff --git a/blocks/columns/columns.js b/blocks/columns/columns.js
index 9b78c81..5405817 100644
--- a/blocks/columns/columns.js
+++ b/blocks/columns/columns.js
@@ -11,6 +11,12 @@ export default function decorate(block) {
         if (picWrapper && picWrapper.children.length === 1) {
           // picture is only content in column
           picWrapper.classList.add('columns-img-col');
+
+          const picWrapperChildren = picWrapper.children[0];
+          // remove paragraph wrapping picture
+          if (picWrapperChildren.tagName === 'P') {
+            picWrapperChildren.replaceWith(...picWrapperChildren.children);
+          }
         }
       }
     });