diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 059a7f0..5a250b7 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,6 +1,7 @@
 class CalendarsController < ApplicationController
   # GET /calendars
   # GET /calendars.json
+    load_and_authorize_resource
   def index
     @calendars = Calendar.all
     respond_to do |format|
@@ -80,4 +81,6 @@ class CalendarsController < ApplicationController
       format.json { head :no_content }
     end
   end
+  def verwalten
+  end
 end
diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 4f5de1d..5f317b1 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -2,4 +2,5 @@ class Calendar < ActiveRecord::Base
   attr_accessible :name, :public, :picture
   has_and_belongs_to_many :calentries
   mount_uploader :picture, PictureUploader
+  resourcify
 end
diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index 47f90ee..d4c64bc 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -8,6 +8,7 @@ class Calentry < ActiveRecord::Base
 		errors.add(:ende, "Es muss ein Endzeitpunkt vorhanden sein")
 	end
   end
+  resourcify
   def start_time
     start
   end
@@ -17,4 +18,5 @@ class Calentry < ActiveRecord::Base
   def name
 	summary
   end
+  
 end
diff --git a/app/views/calendars/_tabs.html.erb b/app/views/calendars/_tabs.html.erb
new file mode 100644
index 0000000..e449cfe
--- /dev/null
+++ b/app/views/calendars/_tabs.html.erb
@@ -0,0 +1,16 @@
+<ul class="nav nav-tabs">
+ <li <%= (request.fullpath == calendars_path)? 'class="active"' : ''%> >
+ <%= link_to I18n.t 'calendars.alle' , calendars_path %> </li>
+<% for c in Calendar.all %>
+  <li <%= (!@calendar.nil? && c == @calendar) ? 'class="active"' : '' %> title="<%= c.name %>">
+    <%= link_to c.name, c %>
+    </li>
+<% end %>
+<% if request.fullpath == calendars_verwalten_path %>
+  <li class="active pull-right">
+  <% else %>
+  <li class="pull-right">
+<% end %>
+<%= link_to "Verwaltung", calendars_verwalten_path %>
+</li>
+</ul>
diff --git a/app/views/calendars/index.html.erb b/app/views/calendars/index.html.erb
index 8d6c591..ad394cb 100644
--- a/app/views/calendars/index.html.erb
+++ b/app/views/calendars/index.html.erb
@@ -1,5 +1,13 @@
-<h1>Listing calendars</h1>
+<div class="container-fluid">
+<div class="row-fluid">
+<div class="span12">
+<%= render 'tabs' %>
+</div>
+</div>
 
+<div class="row-fluid">
+<div class="span12">
+<h1><%= I18n.t 'calendars.calendar' %></h1>
 <% @calendars.each do |calendar| %>
     <div class="media">
 	<a class="pull-left" href="#">
@@ -10,5 +18,11 @@
 	</div>
     </div>
 <% end %>
-
-<%= link_to 'New Calendar', new_calendar_path %>
+</div>
+</div>
+<div class="row-fluid">
+<div class="span12">
+<%= link_to 'New Calendar', new_calendar_path unless cannot?(:new, Calendar) %>
+</div>
+</div>
+</div>
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index cb20b2a..cc75f51 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -1,4 +1,9 @@
 <div class="container-fluid">
+<div class="row-fluid">
+<div class="span12">
+<%= render 'calendars/tabs' %>
+</div>
+</div>
  <div class="row-fluid">
 <p id="notice"><%= notice %></p>
 
diff --git a/config/locales/calendars.de.yml b/config/locales/calendars.de.yml
new file mode 100644
index 0000000..f109d8c
--- /dev/null
+++ b/config/locales/calendars.de.yml
@@ -0,0 +1,5 @@
+
+de:
+  calendars:
+    alle: "Alle Kalender"
+    calendar: "Kalender"