diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index b34ef46..e7a20e5 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -5,7 +5,6 @@ class RubrikenController < ApplicationController
     @rubriken = Rubrik.all
     @neuigkeiten = Neuigkeit.recent
   end
-
  
   def show
     @rubrik = Rubrik.find(params[:id])
@@ -20,7 +19,6 @@ class RubrikenController < ApplicationController
   def edit
     @rubrik = Rubrik.find(params[:id])
   end
-
   
   def create
     @rubrik = Rubrik.new(params[:rubrik])
@@ -51,6 +49,16 @@ class RubrikenController < ApplicationController
       format.html { redirect_to @rubrik,:notice => response_notice }
     end
   end
+
+  def removemoderator
+    rubrik = Rubrik.find(params[:id])
+    m = User.find(params[:moderator])
+    if m.has_role?(:newsmoderator,rubrik) 
+      m.remove_role(:newsmoderator,rubrik)
+    end
+    redirect_to verwalten_rubrik_path(rubrik)
+  end
+
   def update
     @rubrik = Rubrik.find(params[:id])
 
@@ -64,13 +72,24 @@ class RubrikenController < ApplicationController
       end
     end
   end
+
   def verwalten
-  @rubrik = Rubrik.find(params[:id])
-  @moderatoren=User.with_role(:newsmoderator,@rubrik)
-  end
+    @rubrik = Rubrik.find(params[:id])
+    @neuigkeiten_unpublished = @rubrik.neuigkeiten.unpublished
+    @neuigkeiten_published=@rubrik.neuigkeiten.published
+    @moderatoren=User.with_role(:newsmoderator,@rubrik)
+  end  
+
+  # Alle Rubriken verwalten und Sachen einstellen..
   def alle_verwalten
-  @rubriken =Rubrik.all
+    @rubriken =Rubrik.all
+    @neuigkeiten_unpublished = Neuigkeit.unpublished
+    @neuigkeiten_public_published = Neuigkeit.published.public
+
+    @toolbar_elements << {:text=>I18n.t('common.new'),:path=>new_rubrik_path() ,:icon=>:plus} if can? :new, Rubrik
+
   end
+
   # DELETE /rubriken/1
   # DELETE /rubriken/1.json
   def destroy
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index f7b8b2b..52342fa 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -24,6 +24,8 @@ class Neuigkeit < ActiveRecord::Base
   mount_uploader :picture, PictureUploader
   scope :published, -> {where("datum <= ? AND datum IS NOT NULL", Time.now.to_date).order(:datum).reverse_order}
   scope :recent, -> { published.where("updated_at >= ? ",Time.now - 7.days)}
+  scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
+  scope :public, ->{includes(:rubrik).where("rubriken.public"=>:true)}
   def datum_nilsave
 	self.datum.nil? ? Time.now + 42.years : self.datum
   end
diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb
index 99309c1..0205204 100644
--- a/app/views/gremien/verwalten.html.erb
+++ b/app/views/gremien/verwalten.html.erb
@@ -1,27 +1,32 @@
 <h1>Listing gremien</h1>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Desc</th>
-    <th>Typ</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
+<div class="container-fluid">
 <% @gremien.each do |gremium| %>
-  <tr>
-    <td><%= gremium.name %></td>
-    <td><%= gremium.desc %></td>
-    <td><%= gremium.typ %></td>
-    <td><%= link_to 'Show', gremium %></td>
-    <td><%= link_to 'Edit', edit_gremium_path(gremium) %></td>
-    <td><%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
+  <div class="row-fluid">
+    <div class="span2">
+      <%= gremium.typ %>
+    </div>
+    <div class="span18">
+      <b><%= gremium.name %></b>
+      <%= gremium.desc %>
+    </div>
+    <div span="2">
+      <%= link_to 'Show', gremium %>
+      <%= link_to 'Edit', edit_gremium_path(gremium) %>
+      <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' } %>
+    </div>
+  </div>
 <% end %>
+</div>
+
+
+
+
+
+  <tr></td>
+  </tr>
+
 </table>
 
 <br />
-
+<%= render 'layouts/pretty_toolbar' %>
 <%= link_to 'New Gremium', new_gremium_path %>
diff --git a/app/views/rubriken/_admin_liste.html.erb b/app/views/rubriken/_admin_liste.html.erb
index febe11e..e5bae28 100755
--- a/app/views/rubriken/_admin_liste.html.erb
+++ b/app/views/rubriken/_admin_liste.html.erb
@@ -1,8 +1,23 @@
 <table class="table">
-<% rubriken.each do |r| %>
-<% r.neuigkeiten.each do |n| %>
-<tr>
-<td><%= r.name %></td><td><%= n.title %></td></tr>
-<% end 
-end %>
+  <% neuigkeiten.each do |n| %>
+  <% r = n.rubrik %>
+  <tr>
+    <td><%= r.public%></td>
+    <td><%= r.name %></td>
+    <td>
+      <%= n.title %> 
+     
+    </td> 
+    <td>
+      <%= unless n.datum.nil? 
+	  I18n.l(n.datum) 
+	  else 
+	  link_to "publish", publish_rubrik_neuigkeit_path(r,n) if can?(:publish, n) 
+	  end
+	  %>
+      
+      <%= link_to "edit", edit_rubrik_neuigkeit_path(r,n) if can? :publish, n %>
+    </td>
+  </tr>
+  <% end %>
 </table>
diff --git a/app/views/rubriken/alle_verwalten.html.erb b/app/views/rubriken/alle_verwalten.html.erb
index 9e38681..7d44657 100755
--- a/app/views/rubriken/alle_verwalten.html.erb
+++ b/app/views/rubriken/alle_verwalten.html.erb
@@ -1,5 +1,15 @@
+<h1>Neuigkeiten Verwaltung</h1>
+<h2>Rubriken</h2>
+<ul>
+  <% @rubriken.each do |r| %>
+  <li> <%= link_to r.name, verwalten_rubrik_path(r)%></li>
+  <% end %>
+</ul>
+<h2>Nicht veröffentlicht</h2>
+<%= render :partial=>"admin_liste", :locals=>{:neuigkeiten=>@neuigkeiten_unpublished} %>
+<h2>Öffentlich veröffentlicht</h2>
+<%= render :partial=>"admin_liste", :locals=>{:neuigkeiten=>@neuigkeiten_public_published} %>
 
-<%= render :partial=>"admin_liste", :locals=>{:rubriken=>@rubriken} %>
+<%= render 'layouts/pretty_toolbar' %>
 
 
-<%= link_to 'New Rubrik', new_rubrik_path unless cannot?(:new, Rubrik) %>
diff --git a/app/views/rubriken/verwalten.html.erb b/app/views/rubriken/verwalten.html.erb
index aca6824..5fe9f4f 100755
--- a/app/views/rubriken/verwalten.html.erb
+++ b/app/views/rubriken/verwalten.html.erb
@@ -1,22 +1,32 @@
 <h1><%= @rubrik.name %></h1>
- <p id="notice"><%= notice %></p>
-<%= render :partial=>'admin_liste', :locals=>{:rubriken => [@rubrik]} %>
- 
+
+<p id="notice"><%= notice %></p>
+<h2>Nicht Veröffentlicht</h2>
+<%= render :partial=>'admin_liste', :locals=>{:neuigkeiten => @neuigkeiten_unpublished} %>
+<h2>Veröffentlicht</h2>
+<%= render :partial=>'admin_liste', :locals=>{:neuigkeiten => @neuigkeiten_published} %>
+
+<b>Moderatoren:</b> 
 <table class="table">
-<b>Moderatoren:</b><i>
-<% @moderatoren.each do |m|%>
-<tr><td>
-<%= m.email%></td><td>Entfernen</td></tr>
-<% end%></i>
+    <% @moderatoren.each do |m|%>
+    <tr>
+      <td>
+	<%= m.email%>
+      </td>
+      <td>
+	<%= link_to "Entfernen" , removemoderator_rubrik_path(:rubrik,{:moderator=>m.id})%>
+      </td>
+    </tr>
+    <% end%>
+</table>
 
-
-
-<%= semantic_form_for @rubrik, :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
+<%= semantic_form_for [@rubrik], :url=> url_for(:action => 'addmoderator',:id=>@rubrik.id) do |f| %>
 <%= f.inputs do %>
 <%= f.input :moderator, :as => :select, :collection => Hash[User.all.map{|b| [b.email,b.id]}] ,:label=>"Hinzufuegen"%>
 <% end %>
 <%= f.action :submit %>
 <% end %>
+
 <%= link_to 'Edit', edit_rubrik_path(@rubrik) %> |
 <%= link_to 'Anzeigen', rubrik_path(@rubrik) %>
 <%= link_to 'Destroy', @rubrik, method: :delete, data: { confirm: 'Are you sure?' } %>