diff --git a/app/views/rubriken/_tabs.html.erb b/app/views/rubriken/_tabs.html.erb
new file mode 100644
index 0000000..86af436
--- /dev/null
+++ b/app/views/rubriken/_tabs.html.erb
@@ -0,0 +1,18 @@
+<ul class="nav nav-tabs">
+ <li <%= (request.fullpath == rubriken_path)? 'class="active"' : ''%> >
+ <%= link_to I18n.t 'rubriken.alle' , calendars_path %> </li>
+<% for r in Rubrik.all %>
+  <li <%= (!@rubrik.nil? && r == @rubrik) ? 'class="active"' : '' %> title="<%= r.name %>">
+    <%= link_to r.name, r %>
+    </li>
+<% end %>
+<% if can? :verwalten, Rubrik%>
+<% if request.fullpath == rubriken_verwalten_path %>
+  <li class="active pull-right">
+  <% else %>
+  <li class="pull-right">
+<% end %>
+<%= link_to "Verwaltung", rubriken_verwalten_path %>
+</li>
+<% end %>
+</ul>
diff --git a/app/views/rubriken/index.html.erb b/app/views/rubriken/index.html.erb
index 6dd3706..7591824 100755
--- a/app/views/rubriken/index.html.erb
+++ b/app/views/rubriken/index.html.erb
@@ -1,6 +1,7 @@
+
+
+<%= render 'tabs' %>
 <h1><%= I18n.t("rubrik.title")%></h1>
-
-
 <% @rubriken.each do |rubrik| %>
 
 
@@ -16,4 +17,4 @@
 
 <br />
 
-<%= link_to 'New Rubrik', new_rubrik_path %>
+<%= link_to 'New Rubrik', new_rubrik_path unless cannot?(:new, Rubrik) %>
diff --git a/app/views/rubriken/show.html.erb b/app/views/rubriken/show.html.erb
index b17ecd1..380d922 100755
--- a/app/views/rubriken/show.html.erb
+++ b/app/views/rubriken/show.html.erb
@@ -1,10 +1,5 @@
+<%= render 'tabs' %>
 
-<ul class="breadcrumb">
-<li>
-<%= link_to "Neuigkeiten"  , rubriken_path%> <span class="divider">/</span></li>
-<li><%= link_to @rubrik.name , rubrik_path(@rubrik)%></li>
-
-</ul>
 <p id="notice"><%= notice %></p>
 <div class="row-fluid">
 <span class="span12">