diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index 957b754..4383cb6 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -6,71 +6,80 @@
 
 <div class="row">
   <div class="col-md-12">
-    <%= form_for(@org, url: admin_update_org_path(@org), html: { class: "roadmap-form bordered", multipart: true, id: "edit_org_details",  method: :put}) do |f| %>
+  <%= form_for(@org, url: admin_update_org_path(@org), html: { multipart: true, method: :put, id: "edit_org_details_form", class: "form-horizontal" } ) do |f| %>
 
-      <fieldset class="side-by-side">
-        <div class="form-input">
-          <%= f.label :name, class: 'required' %>
-          <%= f.text_field :name, class: "left-indent required input-large" %>
-        </div>
-        <div class="form-input">
-          <%= f.label :abbreviation, class: 'required' %>
-          <%= f.text_field :abbreviation, class: "left-indent required input-small" %>
-        </div>
-      
-        <% if @org.logo.present? %>
-          <div class="org-logo form-input">
-            <%= f.label :logo %>
-            <%= image_tag @org.logo.url, alt: "#{@org.name} #{_('logo')}", class: 'left-indent' %>
-            <div class="inline" id="logo-controls">
-              <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo %>
-              <%= f.check_box :remove_logo, title: _("This will remove your organisation's logo") %>
-              <br />
-              <div class="inline" id="logo-controls-separator">
-                <strong> - <%= _('or') %> - </strong>
-              </div>
-              <br />
-              <%= f.file_field :logo %>
-            </div>
+    <div class="form-group">
+      <%= f.label :name, 'Organization Name', class: "col-sm-2 control-label" %>
+      <div class="col-sm-8">
+        <%= f.text_field :name, id: "org_name", class: "form-control", "aria-required": true %>
+      </div>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :abbreviation, 'Abbreviated Name', class: "col-sm-2 control-label" %>
+      <div class="col-sm-8">
+        <%= f.text_field :abbreviation, id: "org_abbreviation", class: "form-control", "aria-required": true %>
+      </div>
+    </div>
+
+    <% if @org.logo.present? %>
+      <div  class="form-group">
+        <%= f.label :logo, 'Organization Logo', class: "col-sm-2 control-label" %>
+        <%= image_tag @org.logo.url, alt: "#{@org.name} #{_('logo')}" %>
+        <div class="form-group">
+          <%= f.label _('Remove logo') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo, class: "col-sm-2 control-label" %>
+          <div class="checkbox">
+            <%= f.check_box :remove_logo, title: _("This will remove your organisation's logo") %>
           </div>
-        <% else %>
-          <div class="form-input">
-            <%= f.label :logo %>
-            <%= f.file_field :logo %>
+          <br />
+          <div>
+            <strong> - <%= _('or') %> - </strong>
           </div>
-        <% end %>
-      
-        <div class="form-input" id="banner-text">
-          <%= f.label _('Top banner text'), for: @org.banner_text %>
-          <div class="inline">
-            <%= text_area_tag('org_banner_text', @org.banner_text, id: "org_banner_text") %>
-            <script>
-              /* Initialises an editor for textarea defined above with id org_banner_text */
-              dmproadmap.utils.tinymce.init({ selector: '#org_banner_text' });
-            </script>
-          </div>
+          <br />
+          <%= f.file_field :logo %>
         </div>
-      
-        <div class="form-input">
-          <%= f.label :target_url %>
-          <%= f.text_field :target_url, class: "left-indent required input-large top-indent" %>
+      </div>
+    <% else %>
+      <div class="form-group">
+        <%= f.label :logo, 'Organization Logo', class: "col-sm-2 control-label"  %>
+        <div class="col-sm-8">
+          <%= f.file_field :logo %>
         </div>
-        <div class="form-input">
-          <%= f.label :contact_email %>
-          <%= f.text_field :contact_email, class: "left-indent required input-medium" %>
-        </div>
-      
-        <div class="form-input">
-          <div class="button-spacer">&nbsp;</div>
-          <%= render partial: 'shared/accessible_submit_button',
-                     locals: {id: 'save_org_submit', 
-                              val: 'Save', 
-                              disabled_initially: true,
-                              tooltip: _('Name and abbreviation are required'),
-                              classes: 'left-indent'} %>
-        </div>
-      </fieldset>
+      </div>
     <% end %>
+
+    <div class="form-group" id="banner-text">
+      <%= f.label _('Top banner text'), for: @org.banner_text, class: "col-sm-2 control-label" %>
+      <div class="col-sm-8">
+        <%= text_area_tag('org_banner_text', @org.banner_text, id: "org_banner_text", class: "form-control") %>
+        <script>
+          /* Initialises an editor for textarea defined above with id org_banner_text */
+          dmproadmap.utils.tinymce.init({ selector: '#org_banner_text' });
+        </script>
+      </div>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :target_url, 'Organization URL', class: "col-sm-2 control-label" %>
+      <div class="col-sm-8">
+        <%= f.text_field :target_url, class: "form-control" %>
+      </div>
+    </div>
+
+    <div class="form-group">
+      <%= f.label :contact_email, 'Contact Email', class: "col-sm-2 control-label" %>
+      <div class="col-sm-8">
+        <%= f.text_field :contact_email, class: "form-control" %>
+      </div>
+    </div>
+    
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <%= f.button(_('Save'), id:"save_org_submit", class: "btn btn-default", type: "submit") %>
+    </div>
+  </div>
+
+  <% end %>
   </div>
 </div>
 
diff --git a/lib/assets/javascripts/application.js b/lib/assets/javascripts/application.js
index 0ad2611..df87c7b 100644
--- a/lib/assets/javascripts/application.js
+++ b/lib/assets/javascripts/application.js
@@ -9,3 +9,5 @@
 import './views/plans/new';
 import './views/plans/share';
 import './views/devise/registrations/edit';
+import './views/orgs/admin_edit';
+
diff --git a/lib/assets/javascripts/views/devise/registrations/edit.js b/lib/assets/javascripts/views/devise/registrations/edit.js
index f8fe810..1e13ae2 100644
--- a/lib/assets/javascripts/views/devise/registrations/edit.js
+++ b/lib/assets/javascripts/views/devise/registrations/edit.js
@@ -1,6 +1,7 @@
 import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
 import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
 import ariatiseForm from '../../../utils/ariatiseForm';
+
 import { addMatchingPasswordValidator, togglisePasswords } from '../../../utils/passwordHelper';
 
 $(() => {
diff --git a/lib/assets/javascripts/views/orgs/admin_edit.js b/lib/assets/javascripts/views/orgs/admin_edit.js
index a74ddd8..793afec 100644
--- a/lib/assets/javascripts/views/orgs/admin_edit.js
+++ b/lib/assets/javascripts/views/orgs/admin_edit.js
@@ -1,20 +1,20 @@
-$(document).ready(function(){
-  //Validate banner_text area for less than 165 character
-  $("form#edit_org_details").submit(function(){
-      if (getStats('org_banner_text').chars > 165) {
-          alert(__('Please only enter up to 165 characters, you have used') + " " + getStats('org_banner_text').chars + ". " + __('If you are entering an URL try to use something like http://tinyurl.com/ to make it smaller.'));
-          return false;
-      }
+import ariatiseForm from '../../utils/ariatiseForm';
+
+$(() => {
+  ariatiseForm({ selector: '#edit_org_details_form' });
+
+  // Validate banner_text area for less than 165 character
+  $('#edit_org_details_form').submit(() => {
+    if (getStats('org_banner_text').chars > 165) {
+      alert(_('Please only enter up to 165 characters, you have used') + ' ' + getStats('org_banner_text').chars + '. ' + _('If you are entering an URL try to use something like http://tinyurl.com/ to make it smaller.'));
+      return false;
+    }
   });
-	
-  $("#org_name").keyup(function(){
-    $("#save_org_submit").attr('aria-disabled', ($(this).val().trim() == '' || 
-                                                 $("#org_abbreviation").val().trim() == ''));
+  $('#org_name').keyup((e) => {
+    $('#save_org_submit').attr('aria-disabled', ($(e.currentTarget).val().trim() === '' || $('#org_abbreviation').val().trim() === ''));
   });
-  $("#org_abbreviation").keyup(function(){
-    $("#save_org_submit").attr('aria-disabled', ($(this).val().trim() == '' || 
-                                                 $("#org_name").val().trim() == ''));
+  $('#org_abbreviation').keyup((e) => {
+    $('#save_org_submit').attr('aria-disabled', ($(e.currentTarget).val().trim() === '' || $('#org_name').val().trim() === ''));
   });
-  
-  $("#save_org_submit").attr('aria-disabled', ($("#org_name").val() && ($("#org_name").val().trim() == '' ||  $("#org_abbreviation").val().trim() == '')));
-});
\ No newline at end of file
+  $('#save_org_submit').attr('aria-disabled', ($('#org_name').val() && ($('#org_name').val().trim() === '' || $('#org_abbreviation').val().trim() === '')));
+});