diff --git a/app/assets/stylesheets/components/modal.scss b/app/assets/stylesheets/components/modal.scss
deleted file mode 100644
index b6e692dae3..0000000000
--- a/app/assets/stylesheets/components/modal.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-$gray: #333;
-$gray-light: #aaa;
-$gray-lighter: #eee;
-$space: 40px;
-$blue: #428bca;
-$blue-dark: darken($blue, 5%);
-
-.modal {
-  &:before {
-    content: "";
-    display: none;
-    background: rgba(0, 0, 0, 0.5);
-    position: fixed;
-    top: 0; left: 0; right: 0; bottom: 0;
-    z-index: 10;
-  }
-
-  &:target {
-    &:before {
-      display: block;
-    }
-
-    .modal-dialog {
-      transform: translate(0, 0);
-      top: 20%;
-    }
-  }
-}
-
-.modal-dialog {
-  background: #fefefe;
-  border: $gray solid 1px;
-  border-radius: 5px;
-  margin-left: -200px;
-  position: fixed;
-  left: 50%;
-  top: -100%;
-  z-index: 11;
-  width: auto;
-  max-width: 455px;
-  transform: translate(0, -500%);
-  transition: 1s ease-out;
-}
-
-.modal-body {
-  padding: $space/2;
-}
-
-.modal-header,
-.modal-footer {
-  padding: $space/4 $space/2;
-}
-
-.modal-header {
-  border-bottom: $gray-lighter solid 1px;
-
-  h2 {
-    font-size: 20px;
-  }
-}
-
-.modal-footer {
-  border-top: $gray-lighter solid 1px;
-  text-align: center;
-}
-
-.modal-warning {
-  background-color: #f8eec7;
-  border: 1px solid #f2e09a;
-  color: #796620;
-  padding-left: 20px;
-}
-
-.btn-close {
-  color: $brand-gray-light;
-
-  &:hover {
-    transition: color 0.25s ease-in;
-    color: $brand-gray-dark;
-  }
-}
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index a740bb9eec..40798039e5 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -176,3 +176,9 @@ a {
 hr {
   border-bottom: 1px solid #e3e3e3;
 }
+
+.dangerzone-container {
+  border: 1px solid #e3e3e3;
+  border-radius: 3px;
+  padding-bottom: 13px;
+}
diff --git a/app/views/organizations/_remove_organization_modal.html.erb b/app/views/organizations/_remove_organization_modal.html.erb
deleted file mode 100644
index 978267a3aa..0000000000
--- a/app/views/organizations/_remove_organization_modal.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<%= content_tag :div, class: 'modal', id: modal_id, "aria-hidden" => "true" do %>
-  <div class="modal-dialog">
-    <div class="modal-header">
-      <h3>
-        Are you ABSOLUTLEY SURE?
-        <%= link_to '', class: 'btn-close right', 'aria-hidden' => 'true' do %>
-          <%= octicon('x') %>
-        <% end %>
-      </h3>
-    </div>
-
-    <div class="modal-warning text-center">
-      <p>Please read this before continuing!</p>
-    </div>
-
-    <div class="modal-body">
-      <p>
-        This will not effect your organization on GitHub, however this will remove access for all other users using this org
-      </p>
-    </div>
-
-    <div class="modal-footer">
-      <%= form_for @organization, html: { method: :delete } do |f| %>
-        <%= f.submit 'I understand the consequences, remove the organization', class: 'btn btn-danger' %>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb
index cadd3048b4..bc775ea770 100644
--- a/app/views/organizations/edit.html.erb
+++ b/app/views/organizations/edit.html.erb
@@ -1,26 +1,37 @@
-<h1 class="page-header">Edit Organization</h1>
-<div class="columns">
-  <div class="one-half column centered">
-    <%= form_for @organization do |f| %>
-      <%= render 'shared/error_messages', object: f.object %>
+<%= render 'organizations/organization_banner' %>
 
-      <dl class="form">
-        <dt><%= f.label :title, class: 'input-label' %></dt>
-        <dd><%= f.text_field :title, class: 'textfield' %></dd>
-      </dl>
+<div class="site-content">
+  <div class="site-content-cap">
+    <h2 class="site-content-heading"><%= @organization.title %> settings</h2>
+  </div>
+</div>
 
-      <div class="form-actions left">
-        <%= link_to 'Cancel', @organization, class: 'btn', role: 'button' %>
-        <%= f.submit 'Update Organization', class: 'btn btn-primary' %>
+<div class="site-content-body">
+  <%= form_for @organization do |f| %>
+    <%= render 'shared/error_messages', object: f.object %>
+
+    <div class="columns">
+      <div class="two-thirds column">
+        <dl class="form">
+          <dt><%= f.label :title %></dt>
+          <dd><%= f.text_field :title, class: 'textfield' %></dd>
+        </dl>
       </div>
-    <% end %>
 
-    <!-- I promise I'll come and style this later -->
-    <br><br><br><br>
-    <!-- -->
+      <div class="one-third column dangerzone-container">
+        <p class="text-emphasized">Remove this organization</p>
+        <p class="text-muted">Once you remove this organization, there is not going back. Please be certain.</p>
+        <p class="text-muted">Everything you have created, and every student that you have invited will also be removed from your organization on github.com</p>
 
-    <%= link_to 'Remove Organization', '#delete-organization', class: 'btn btn-danger', role: 'button' %>
-  </div>
-</div>
+        <%= form_for @organization, html: { method: :delete } do |f| %>
+          <%= f.submit 'Remove this organization', class: 'btn btn-block btn-danger' %>
+        <% end %>
+      </div>
+    </div>
 
-<%= render partial: 'remove_organization_modal', locals: { modal_id: 'delete-organization' } %>
+    <div class="form-actions">
+      <%= f.submit 'Save changes', class: 'btn btn-green' %>
+      <%= link_to 'Cancel', @organization, class: 'btn', role: 'button' %>
+    </div>
+  <% end %>
+</div>