diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 190a8b7..4c0f282 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -35,7 +35,7 @@
     after_assign :resize_image
   end
   
-  validates_property :width, of: :logo, in: (0..160)
+  validates_property :height, of: :logo, in: (0..100)
   validates_property :format, of: :logo, in: ['jpeg', 'png', 'gif','jpg','bmp']
   validates_size_of :logo, maximum: 500.kilobytes
 
@@ -190,8 +190,8 @@
     #
     def resize_image
       unless logo.nil?
-        if logo.height != 160 && logo.width != 160
-          self.logo = logo.thumb('160x')  # resize width and maintain aspect ratio
+        if logo.height != 100
+          self.logo = logo.thumb('x100')  # resize height and maintain aspect ratio
         end
       end
     end 
diff --git a/app/views/layouts/_dmponline_header.html.erb b/app/views/layouts/_dmponline_header.html.erb
index b80c58b..65c5036 100644
--- a/app/views/layouts/_dmponline_header.html.erb
+++ b/app/views/layouts/_dmponline_header.html.erb
@@ -3,11 +3,7 @@
 <div class="main_header">
 	<div class="header_left">
         <div class="home_logo">
-          <% if (user_signed_in?) && (!current_user.organisation.nil?) && (current_user.organisation.logo.present?) then %>
-            <%= link_to(image_tag(current_user.organisation.logo.thumb('100x100%').url), current_user.organisation.target_url) %>
-          <% else %> 
-            <%= link_to( image_tag("logo.jpg"), root_path)%>
-          <% end %>
+          <%= link_to( image_tag("logo.jpg"), root_path)%>
         </div>
     </div>
     <div class="header_right">	
diff --git a/app/views/layouts/_dmponline_org_branding.html.erb b/app/views/layouts/_dmponline_org_branding.html.erb
index 3a0b3a1..e6f0af6 100644
--- a/app/views/layouts/_dmponline_org_branding.html.erb
+++ b/app/views/layouts/_dmponline_org_branding.html.erb
@@ -1,34 +1,24 @@
 <!-- Org branding info -->
 <div class="branding_container">
-    <% if user_signed_in? then%>
-        <% if current_user.organisation.present? then%>
-            <!-- Logo -->
-            <% if current_user.organisation.logo_file_name.present? then%>
-                <div class="header_org_logo">
-                    <%= image_tag("#{current_user.organisation.logo_file_name}", class: "header_org_logo_img" )%>
-                </div>
-            <%end%>
+	<% if user_signed_in? %>
+		<% if !current_user.organisation.nil? %>
+		
+			<!-- Organisation Logo -->
+      <% if current_user.organisation.logo.present? %>
+				<div class="header_org_logo">
+        	<%= link_to(image_tag(current_user.organisation.logo.thumb('100x100%').url), current_user.organisation.target_url) %>
+				</div>
+      <% end %>
 
-            <!-- Banner text -->
-            <% if current_user.organisation.banner_text.present? then%>
-                <div class="header_org_banner_text">
-                    <span class="header_org_banner_text_vertical_align">
-                        <%= raw current_user.organisation.banner_text %>
-                    </span>
-                </div>
-            <!--% else%>
-                <div class="header_org_banner_text">
-                    <span class="header_org_banner_text_vertical_align" style="padding: 10px 0 0 40px;">
-                        Upcoming DCC workshop - <strong><a href = 'http://www.dcc.ac.uk/events/workshops/advanced-dmponline-how-customise-tool-your-institution' target='blank'>'Advanced DMPonline: how to customise the tool for your institution'</a></strong>,<br> 23 November 2015, Glasgow
-                    </span>
-                </div-->
-            <%end%>
-        <%end%>
-    <!--%else%>
-        <div class="header_org_banner_text">
-            <span class="header_org_banner_text_vertical_align" style="padding: 10px 0 0 40px;">
-                Upcoming DCC workshop - <strong><a href = 'http://www.dcc.ac.uk/events/workshops/advanced-dmponline-how-customise-tool-your-institution' target='blank'>'Advanced DMPonline: how to customise the tool for your institution'</a></strong>,<br> 23 November 2015, Glasgow
-            </span>
-        </div-->
+			<!-- Banner text -->
+			<% if current_user.organisation.banner_text.present? %>
+				<div class="header_org_banner_text">
+					<span class="header_org_banner_text_vertical_align">
+						<%= raw current_user.organisation.banner_text %>
+					</span>
+				</div>
+			<%end%>
+			
+		<%end%>
 	<%end%>
 </div>
\ No newline at end of file