diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index 7d55b33..bd55e35 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -3,13 +3,6 @@
   respond_to :html
 
   ##
-  # GET /organisations/1
-  def admin_show
-    @org = Org.find(params[:id])
-    authorize @org
-  end
-
-  ##
   # GET /organisations/1/edit
   def admin_edit
     @org = Org.find(params[:id])
diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb
index edcffb3..3fb80c2 100644
--- a/app/views/layouts/_branding.html.erb
+++ b/app/views/layouts/_branding.html.erb
@@ -1,23 +1,23 @@
 <!-- Org branding info -->
 <div class="branding-container">
-	<% if user_signed_in? %>
-		<% if !current_user.org.nil? %>
-			<!-- Organisation Logo -->
+  <% if user_signed_in? %>
+    <% if !current_user.org.nil? %>
+      <!-- Organisation Logo -->
       <% if current_user.org.logo.present? %>
-				<div class="header-org-logo">
-        	<%= link_to(image_tag(current_user.org.logo.thumb('100x100%').url), current_user.org.target_url) %>
-				</div>
+        <div class="header-org-logo">
+          <%= link_to(image_tag(current_user.org.logo.thumb('100x100%').url), current_user.org.target_url) %>
+        </div>
       <% end %>
 
-			<!-- Banner text -->
-			<% if current_user.org.banner_text.present? %>
-				<div class="header-org-banner-text">
-					<span class="header-org-banner-text-vertical-align">
-						<%= raw current_user.org.banner_text %>
-					</span>
-				</div>
-			<%end%>
-			
-		<%end%>
-	<%end%>
+      <!-- Banner text -->
+      <% if current_user.org.banner_text.present? %>
+        <div class="header-org-banner-text">
+          <span class="header-org-banner-text-vertical-align">
+            <%= raw current_user.org.banner_text %>
+          </span>
+        </div>
+      <%end%>
+      
+    <%end%>
+  <%end%>
 </div>
\ No newline at end of file
diff --git a/app/views/orgs/admin_edit.html.erb b/app/views/orgs/admin_edit.html.erb
index aa88e23..13dada1 100644
--- a/app/views/orgs/admin_edit.html.erb
+++ b/app/views/orgs/admin_edit.html.erb
@@ -24,7 +24,10 @@
         <% if @org.logo.present? %>
           <div class="org-logo">
             <%= image_tag @org.logo.url %>
-            <%= f.check_box :remove_logo %>&nbsp;&nbsp;&nbsp;<%= _('If you decide to use the default DMPRoadmap logo, please check this box to remove your current logo.') %>
+            <span>
+							<%= f.check_box :remove_logo %>
+							<%= f.label _('Use the %{application_name} logo instead') % {application_name: Rails.configuration.branding[:application][:name]}, for: :remove_logo %>
+						</span>
           </div>
         <% end %>
       </div>
@@ -44,18 +47,17 @@
         <%= f.label :contact_email %>
         <%= f.text_field :contact_email, class: "left-indent required input-medium" %>
       </div>
+      
+      <div class="form-input">
+        <label></label>
+        <%= 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 class="div_clear"></div>
-
-    <div class="form-input">
-      <label></label>
-      <%= 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>
   <% end %>
 </div>
 
diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss
index 4a4e326..7cc371a 100644
--- a/lib/assets/stylesheets/dmproadmap/base.scss
+++ b/lib/assets/stylesheets/dmproadmap/base.scss
@@ -139,25 +139,25 @@
           color: white;
         }
         
-				.header-org-logo, .header-org-banner-text {
-					display: inline-block;
-				}
-				
-				.header-org-logo {
-					width: 15%;
-					background-color: $white;
-					padding: 5px 0 5px 5px;
-					margin-right: 10px;
-				}
-				.header-org-banner-text {
-					width: 60%;
-					vertical-align: top;
-				}
+        .header-org-logo, .header-org-banner-text {
+          display: inline-block;
+        }
+        
+        .header-org-logo {
+          width: 15%;
+          background-color: $white;
+          padding: 5px 0 5px 5px;
+          margin-right: 10px;
+        }
+        .header-org-banner-text {
+          width: 60%;
+          vertical-align: top;
+        }
       }
       .main-nav {
         height: 40%;
-				margin-top: 5px;
-				
+        margin-top: 5px;
+        
         ul.nav {
           position: relative;
           padding-left: 0;
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index 50350b9..d46fffd 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -16,16 +16,31 @@
   border: 1px solid $medium-grey;
 }
 input[type="checkbox"], input[type="radio"] {
-	border: 1px solid $medium-grey;
+  border: 1px solid $medium-grey;
 }
 div.wysiwyg-textarea {
   display: inline-block;
-  margin: 5px 0 10px 15px;
+  margin: 10px 10px 10px 15px;
 }
 textarea:focus, 
 input[type="text"]:focus, input[type="email"]:focus, input[type="password"]:focus,
 input[type="search"]:focus, input[type="checkbox"]:focus, input[type="radio"]:focus {
-	box-shadow: 0 0 8px $light-grey;
+  box-shadow: 0 0 8px $light-grey;
+}
+
+.org-logo {
+  position: absolute;
+  top: -35px;
+  left: 65%;
+  
+  span {
+    width: 150px;
+    vertical-align: top;
+    
+    label {
+      margin-top: 35px;
+    }
+  }
 }
 
 form, fieldset {
@@ -296,7 +311,7 @@
 
 .combobox-clear-button, .combobox-clear-button:hover, .combobox-clear-button:focus {
   @include icon(times-circle);
-	cursor: pointer;
+  cursor: pointer;
   display: inline;
   position: absolute;
   border: none;
@@ -454,8 +469,8 @@
 /* Create plan */
 /* ------------------------------------------------ */
 #create_plan {
-	position: relative;
-	
+  position: relative;
+  
   fieldset {
     padding-bottom: 15px;
   }