diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 2cb9177..4fc26dc 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -17,7 +17,7 @@ class ApplicationController < ActionController::Base
     !@no_design_blocks
   end
   def uses_design_blocks?
-    self.class.uses_design_blocks?
+    !@no_design_blocks && self.class.uses_design_blocks?
   end
   module UsesDesignBlocksHelper
     def uses_design_blocks?
diff --git a/app/controllers/my_profile/profile_editor_controller.rb b/app/controllers/my_profile/profile_editor_controller.rb
index eaceae4..c4b13b6 100644
--- a/app/controllers/my_profile/profile_editor_controller.rb
+++ b/app/controllers/my_profile/profile_editor_controller.rb
@@ -50,6 +50,7 @@ class ProfileEditorController < MyProfileController
   end
 
   def header_footer
+    @no_design_blocks = true
     if request.post?
       @profile.update_attributes!(:custom_footer => params[:custom_footer], :custom_header => params[:custom_header])
       redirect_to :action => 'index'
diff --git a/app/views/profile_editor/header_footer.rhtml b/app/views/profile_editor/header_footer.rhtml
index 3f8eeb6..de9867f 100644
--- a/app/views/profile_editor/header_footer.rhtml
+++ b/app/views/profile_editor/header_footer.rhtml
@@ -4,8 +4,10 @@
 
 <% form_tag do %>
   <div style='width: 90%; margin: auto;'>
-    <%= labelled_form_field(_('Content for header '), text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;')) %>
-    <%= labelled_form_field(_('Content for footer'), text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;')) %>
+    <h2><%= _('Content for header ') %></h2>
+    <%= text_area_tag(:custom_header, @header, :style => 'width: 100%; height: 150px;') %>
+    <h2><%= _('Content for footer') %></h2>
+    <%= text_area_tag(:custom_footer, @footer, :style => 'width: 100%; height: 150px;') %>
     <% button_bar do %>
       <%= submit_button(:save, _('Save')) %>
       <%= button(:cancel, _('Cancel'), :action => 'index') %>
--
libgit2 0.21.2