diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss
index b19590a97..ed3f0dda5 100644
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -31,6 +31,15 @@ $table-header:   #ecf1f6;
 .admin {
   @include admin-layout;
 
+  main {
+    &.admin-site-customization-pages-new,
+    &.admin-site-customization-pages-edit {
+      > header {
+        @include grid-row;
+      }
+    }
+  }
+
   h2 {
     font-weight: 100;
     margin-bottom: $line-height;
@@ -503,8 +512,12 @@ code {
 
   a,
   button {
-    @include regular-button;
-    margin-left: auto;
+    margin-#{$global-left}: auto;
+
+    &:not(.delete) {
+      @include regular-button;
+      margin-#{$global-left}: auto;
+    }
   }
 }
 
diff --git a/app/components/admin/site_customization/pages/edit_component.html.erb b/app/components/admin/site_customization/pages/edit_component.html.erb
new file mode 100644
index 000000000..327bbcbc7
--- /dev/null
+++ b/app/components/admin/site_customization/pages/edit_component.html.erb
@@ -0,0 +1,8 @@
+<% provide :main_class, "admin-site-customization-pages-edit" %>
+<%= back_link_to admin_site_customization_pages_path %>
+
+<%= header do %>
+  <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(page), method: :delete, class: "delete" %>
+<% end %>
+
+<%= render "form" %>
diff --git a/app/components/admin/site_customization/pages/edit_component.rb b/app/components/admin/site_customization/pages/edit_component.rb
new file mode 100644
index 000000000..0e1cf20f4
--- /dev/null
+++ b/app/components/admin/site_customization/pages/edit_component.rb
@@ -0,0 +1,12 @@
+class Admin::SiteCustomization::Pages::EditComponent < ApplicationComponent
+  include Header
+  attr_reader :page
+
+  def initialize(page)
+    @page = page
+  end
+
+  def title
+    t("admin.site_customization.pages.edit.title", page_title: page.title)
+  end
+end
diff --git a/app/components/admin/site_customization/pages/new_component.html.erb b/app/components/admin/site_customization/pages/new_component.html.erb
new file mode 100644
index 000000000..aee470c74
--- /dev/null
+++ b/app/components/admin/site_customization/pages/new_component.html.erb
@@ -0,0 +1,6 @@
+<% provide :main_class, "admin-site-customization-pages-new" %>
+<%= back_link_to admin_site_customization_pages_path %>
+
+<%= header %>
+
+<%= render "form" %>
diff --git a/app/components/admin/site_customization/pages/new_component.rb b/app/components/admin/site_customization/pages/new_component.rb
new file mode 100644
index 000000000..74c90de79
--- /dev/null
+++ b/app/components/admin/site_customization/pages/new_component.rb
@@ -0,0 +1,12 @@
+class Admin::SiteCustomization::Pages::NewComponent < ApplicationComponent
+  include Header
+  attr_reader :page
+
+  def initialize(page)
+    @page = page
+  end
+
+  def title
+    t("admin.site_customization.pages.new.title")
+  end
+end
diff --git a/app/views/admin/site_customization/pages/edit.html.erb b/app/views/admin/site_customization/pages/edit.html.erb
index 1965b636f..9484633df 100644
--- a/app/views/admin/site_customization/pages/edit.html.erb
+++ b/app/views/admin/site_customization/pages/edit.html.erb
@@ -1,14 +1 @@
-<% provide :title do %>
-  <%= t("admin.header.title") %> - <%= t("admin.menu.site_customization.pages") %> - <%= @page.title %>
-<% end %>
-
-<%= back_link_to admin_site_customization_pages_path %>
-<div class="row">
-  <div class="small-12 column">
-    <h2 class="inline-block"><%= t("admin.site_customization.pages.edit.title", page_title: @page.title) %></h2>
-
-    <%= link_to t("admin.site_customization.pages.index.delete"), admin_site_customization_page_path(@page), method: :delete, class: "delete float-right" %>
-  </div>
-</div>
-
-<%= render "form" %>
+<%= render Admin::SiteCustomization::Pages::EditComponent.new(@page) %>
diff --git a/app/views/admin/site_customization/pages/new.html.erb b/app/views/admin/site_customization/pages/new.html.erb
index dd6fdddd6..bb45bfb51 100644
--- a/app/views/admin/site_customization/pages/new.html.erb
+++ b/app/views/admin/site_customization/pages/new.html.erb
@@ -1,12 +1 @@
-<% provide :title do %>
-  <%= t("admin.header.title") %> - <%= t("admin.menu.site_customization.pages") %> - <%= t("admin.site_customization.pages.new.title") %>
-<% end %>
-
-<%= back_link_to admin_site_customization_pages_path %>
-<div class="row">
-  <div class="small-12 column">
-    <h2><%= t("admin.site_customization.pages.new.title") %></h2>
-  </div>
-</div>
-
-<%= render "form" %>
+<%= render Admin::SiteCustomization::Pages::NewComponent.new(@page) %>