diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb
index cd8db04..b09973e 100755
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -1,5 +1,6 @@
 class NeuigkeitenController < ApplicationController
  before_filter {@toolbar_elements=[]}
+  load_and_authorize_resource
   def index
     @neuigkeiten = Neuigkeit.all
   end
@@ -14,8 +15,8 @@ class NeuigkeitenController < ApplicationController
 
   def new
     @neuigkeit = Neuigkeit.new
-    @rubrik=Rubrik.find(params[:rubrik_id])
-    @neuigkeit.rubrik=@rubrik
+    @rubrik=Rubrik.find(params[:rubrik_id]) unless params[:rubrik_id].nil?
+    @neuigkeit.rubrik=@rubrik unless @rubrik.nil?
  end
 
 
@@ -25,7 +26,7 @@ class NeuigkeitenController < ApplicationController
 
   def create
     @neuigkeit = Neuigkeit.new(params[:neuigkeit])
-
+	@rubrik = @neuigkeit.rubrik
     respond_to do |format|
       if @neuigkeit.save
         format.html { redirect_to @neuigkeit, notice: 'Neuigkeit was successfully created.' }
diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index e28aaec..bbff5b5 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -1,5 +1,6 @@
 class RubrikenController < ApplicationController
   before_filter {@toolbar_elements=[]}
+   load_and_authorize_resource
   def index
     @rubriken = Rubrik.all
  
diff --git a/app/views/calendars/_tabs.html.erb b/app/views/calendars/_tabs.html.erb
index e449cfe..3045ea7 100644
--- a/app/views/calendars/_tabs.html.erb
+++ b/app/views/calendars/_tabs.html.erb
@@ -6,6 +6,7 @@
     <%= link_to c.name, c %>
     </li>
 <% end %>
+<% if can?(:verwalten,Calendar) %>
 <% if request.fullpath == calendars_verwalten_path %>
   <li class="active pull-right">
   <% else %>
@@ -13,4 +14,5 @@
 <% end %>
 <%= link_to "Verwaltung", calendars_verwalten_path %>
 </li>
+<% end %>
 </ul>
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index cc75f51..3ad52d1 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -27,8 +27,8 @@
 </div>
  <div class="row-fluid">
 <div class="btn-group">
-<%= link_to 'New Entry', new_calentry_path, {:class=>"btn"} %>
-<%= link_to 'Edit', edit_calendar_path(@calendar), {:class=>"btn"} %>
+<%= link_to 'New Entry', new_calentry_path, {:class=>"btn"} unless cannot? :new, Calendar%>
+<%= link_to 'Edit', edit_calendar_path(@calendar), {:class=>"btn"} unless cannot? :edit, Calendar %>
 <%= link_to 'Back', calendars_path, {:class=>"btn"} %>
 </div>
 </div>
diff --git a/app/views/neuigkeiten/new.html.erb b/app/views/neuigkeiten/new.html.erb
index 597e29f..cb7500e 100755
--- a/app/views/neuigkeiten/new.html.erb
+++ b/app/views/neuigkeiten/new.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', rubrik_path(@rubrik) %>
+<%= link_to 'Back', rubrik_path(@rubrik) unless @rubrik.nil?   %>