diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 277fff637..bb15ed9c0 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -71,7 +71,9 @@ main {
   &.debate-new,
   &.proposal-new,
   &.sdg-goals-index,
-  &.sdg-goal-show {
+  &.sdg-goal-show,
+  &.topic-edit,
+  &.topic-new {
     @include grid-column-gutter;
   }
 }
diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb
index 579dfd141..739040616 100644
--- a/app/views/topics/_form.html.erb
+++ b/app/views/topics/_form.html.erb
@@ -2,13 +2,8 @@
 
   <%= render "shared/errors", resource: @topic %>
 
-  <div class="row">
-    <div class="small-12 column">
-      <%= f.text_field :title %>
-      <%= f.text_area :description, rows: "5" %>
-
-      <%= f.submit(class: "button", value: t("community.topic.form.#{action_name}.submit_button")) %>
-    </div>
-  </div>
+  <%= f.text_field :title %>
+  <%= f.text_area :description, rows: "5" %>
 
+  <%= f.submit(class: "button", value: t("community.topic.form.#{action_name}.submit_button")) %>
 <% end %>
diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb
index 699202e20..8788b1229 100644
--- a/app/views/topics/edit.html.erb
+++ b/app/views/topics/edit.html.erb
@@ -1,8 +1,7 @@
-<div class="row">
+<main class="topic-edit">
+  <%= back_link_to community_path(@community) %>
 
-  <div class="small-12 medium-9 column">
-    <%= back_link_to community_path(@community) %>
-    <h1><%= t("community.topic.edit") %></h1>
-    <%= render "form" %>
-  </div>
-</div>
+  <h1><%= t("community.topic.edit") %></h1>
+
+  <%= render "form" %>
+</main>
diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb
index 041fe6903..aed9fbd71 100644
--- a/app/views/topics/new.html.erb
+++ b/app/views/topics/new.html.erb
@@ -1,12 +1,9 @@
-<div class="row">
+<main class="topic-new">
+  <%= back_link_to community_path(@community) %>
 
-  <div class="small-12 medium-9 column">
-    <%= back_link_to community_path(@community) %>
-    <h1><%= t("community.topic.create") %></h1>
-    <%= render "form" %>
-  </div>
+  <h1><%= t("community.topic.create") %></h1>
 
-  <div class="small-12 medium-3 column">
+  <aside>
     <h2><%= t("community.topic.sidebar.recommendations_title") %></h2>
 
     <ul class="recommendations">
@@ -14,5 +11,7 @@
       <li><%= t("community.topic.sidebar.recommendation_two") %></li>
       <li><%= t("community.topic.sidebar.recommendation_three") %></li>
     </ul>
-  </div>
-</div>
+  </aside>
+
+  <%= render "form" %>
+</main>