diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 723ea16..116711e 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -2,8 +2,10 @@
<%= javascript_include_tag :defaults %>
<%= design_all_header_tags %>
- <%= stylesheet_link_tag 'comatose_admin' %>
- <%= javascript_include_tag 'comatose_admin' %>
+ <% if params[:controller] == 'comatose_admin' %>
+ <%= stylesheet_link_tag 'comatose_admin' %>
+ <%= javascript_include_tag 'comatose_admin' %>
+ <% end %>
@@ -23,9 +25,12 @@
<%= header %>
-
- <%= flash[:notice] %>
-
+ <% unless flash[:notice].nil? %>
+
+ <%= flash[:notice] %>
+
+ <% end %>
+
<%= design_display(yield) %>
--
libgit2 0.21.2