diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index f4e7657..7a7dfd6 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -18,6 +18,11 @@
     <%= stylesheet_link_tag 'blocks' %>
     <%= stylesheet_link_tag 'forms'  %>
     <%= stylesheet_link_tag 'login-box' %>
+    <%=
+      # Load the controller's css file if it exists:
+      css = "controller_"+ @controller.controller_name() +".css"
+      stylesheet_link_tag( css ) if File.exists?( "public/stylesheets/"+css )
+    %>
 
     <%# FIXME %>
     <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
@@ -32,7 +37,11 @@
     <% end %>
   </head>
 
-  <body class='noosfero category<%= category_color %>' onload='noosfero_init();'>
+  <body class='noosfero category<%= category_color %><%=
+    # Identify the current controller and action for the CSS:
+    " controller_"+ @controller.controller_name() +
+    " action_"+ @controller.controller_name() +"_"+ @controller.action_name()
+    %>' onload='noosfero_init();'>
 
     <% unless flash[:notice].nil? %>
       <div id='notice' onclick="Element.hide('notice');">
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index df32cc2..76086de 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -1,4 +1,4 @@
-<h2><%= _('My profile') %></h2>
+<h1><%= _('My profile') %></h1>
 
 <%= link_to (@profile.image ? image_tag( @profile.image.public_filename) : _('Put image')), :action => 'change_image'  %>
 
diff --git a/app/views/profile_editor/person_info.rhtml b/app/views/profile_editor/person_info.rhtml
index 4bba4d4..447fc89 100644
--- a/app/views/profile_editor/person_info.rhtml
+++ b/app/views/profile_editor/person_info.rhtml
@@ -1,4 +1,4 @@
-<h2><%= _('Edit person info') %></h2>
+<h1><%= _('Edit person info') %></h1>
 
 <% labelled_form_for :info, @info do |f| %>
 
--
libgit2 0.21.2