diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dafbaf5..9b60923 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link rel="shortcut icon" href="http://glonass.htu.tuwien.ac.at/favicon.ico"> 
    <!--<link rel="shortcut icon" href="http://www.fet.at/favicon.ico">-->
-   <title>Fetsite</title>
+   <!---->
    
    <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty?  %>
    <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
@@ -13,7 +13,11 @@
    <% theme_stylesheet_link_tag "mod", :media=>"all" %>
    <%= javascript_include_tag "application" %>
    <%= csrf_meta_tags %>
+<% if content_for?(:header) %>
    <%= yield :header %>
+<% else %>
+<title>Fetsite</title>
+<% end  %>
   </head>
 
   <body>
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 0039867..5b471dc 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -1,3 +1,6 @@
+<%= content_for :header do %>
+<title>Fetsite - <%= I18n.t('home.news') %></title>
+<% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>
 <div class="content-wrap">
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index be7f89d..a16df8d 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -1,3 +1,6 @@
+<%= content_for :header do %>
+<title>Fetsite - <%= @rubrik.name %></title>
+<% end %>
 <%= render 'tabs' %>
 <p id="notice"><%= notice %></p>
 <div class="content-wrap">
@@ -24,6 +27,7 @@
 
 
     <%= render neuigkeit, wrap_in: "li" %>
+
 <% end %>
 </ul>
 
