diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index d4c64bc..a69f5de 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -18,5 +18,5 @@ class Calentry < ActiveRecord::Base
   def name
 	summary
   end
-  
+  scope :upcoming, -> { where("start >= ?" , Time.now).where("start <= ?", 8.days.from_now) }
 end
diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb
index ca5eb35..87a402d 100644
--- a/app/models/fetprofile.rb
+++ b/app/models/fetprofile.rb
@@ -6,4 +6,5 @@ class Fetprofile < ActiveRecord::Base
   def name
   [vorname, nachname, "(",short,")"].join(" ")
   end
+  scope :active, -> { where(:active=>:true).order(:vorname) } 
 end
diff --git a/app/views/fetprofiles/index.html.erb b/app/views/fetprofiles/index.html.erb
index 8f27cff..b005167 100644
--- a/app/views/fetprofiles/index.html.erb
+++ b/app/views/fetprofiles/index.html.erb
@@ -1,23 +1,25 @@
+<div class="container-fluid">
+  <div class="row-fluid">
+	  <div class="span12">
 <h1>Listing fetprofiles</h1>
+</div>
+</div>
 
-<ul>
 <% @fetprofiles.each do |fetprofile| %>
-<li>
-	<%= %>
-    <td><%= fetprofile.vorname %></td>
-    <td><%= fetprofile.nachname %></td>
-    <td><%= fetprofile.short %></td>
-    <td><%= fetprofile.fetmailalias %></td>
-    <td><%= fetprofile.desc %></td>
-
-    <td><%= fetprofile.active %></td>
-    <td><%= link_to 'Show', fetprofile %></td>
-    <td><%= link_to 'Edit', edit_fetprofile_path(fetprofile) %></td>
-    <td><%= link_to 'Destroy', fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-</li>
+<div class="row-fluid">
+	<div class="span3">
+	<%= image_tag fetprofile.picture.portrait.url %>
+	</div>
+	<div class="span9">
+	
+    <h2><%= link_to fetprofile.name, fetprofile %></h2>
+    <p><%= fetprofile.fetmailalias %></p>
+    <p><%= fetprofile.desc %></p>
+    <p><%= fetprofile.active %> </p>
+</div>
+</div>
 <% end %>
-</ul>
-
-<br />
-
+<div class="row-fluid">
+<div class="span12">
 <%= link_to 'New Fetprofile', new_fetprofile_path %>
+</div></div></div>
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index 99e2912..b4e17fc 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -16,7 +16,7 @@
 <p>
    <%= "<b>Aktiv</b>".html_safe if @fetprofile.active %>
 </p>
-
+<p><%= link_to 'Destroy', @fetprofile, method: :delete, data: { confirm: 'Are you sure?' } %></p>
 </div>
 </div>
 
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index 95849b0..052f027 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -33,7 +33,7 @@
 <div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery">
 <% @gallery.fotos.each do |f| %>
 
-<a href="<%= f.datei.url%>" title="<%=f.title%>" data-gallery="gallery">
+<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
 <%=image_tag(f.datei.big_thumb.url,{:class=>"img-polaroid"}) %></a>
 
 
diff --git a/app/views/home/setup_fetsite_dev.html.erb b/app/views/home/setup_fetsite_dev.html.erb
index a4f6161..2d7dc0e 100644
--- a/app/views/home/setup_fetsite_dev.html.erb
+++ b/app/views/home/setup_fetsite_dev.html.erb
@@ -3,7 +3,8 @@
 <h2>Git installieren und Repository koperen</h2>
 Falls noch nicht installiert, GIT installieren
 <pre>sudo apt-get install git git-cola</pre>
-Repository auf Github forken und dann auf dem Rechner clonen.
+Repository auf Github forken und dann auf dem Rechner clonen. 
+Den folgenden Befehl im Verzeichnis in das gekont werden soll ausführen.
 <pre>git clone https://github.com/<github username>/fetsite</pre>
 <h2>Ruby on Rails installieren </h2>
 Ruby 1.9 installieren wobei wichtig ist, dass die Version 1.9 ist
@@ -12,6 +13,7 @@ Falls mehrere Ruby Versionen installiert ist mit
 <pre> sudo update-alternatives --config ruby</pre>
 überprüfen, dass Ruby 1.9 verwendet wird.
 <pre>sudo apt-get install rubygems1.9</pre>
+Im angelegten Verzeichnis den bundle installer ausführen.
 <pre>sudo gem install bundler</pre>
 ImageMagick,sqlite3 installieren
 <pre>sudo apt-get install libmagickwand-dev libsqlite3-dev nodejs</pre>
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index 738252e..7b93ae5 100755
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -13,6 +13,8 @@
 	  </li>
 	  <li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
 	  <li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
+	  <li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
+	  <li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>
 	  <li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
 	  <li><%= link_to "Kalender", calendars_path %></li>
 	  <li class="divider"></li>
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 765c261..5c4d4b8 100755
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -7,7 +7,7 @@ Devise.setup do |config|
   config.mailer_sender = "test@example.com"
 
   # Configure the class responsible to send e-mails.
- # config.mailer = "Devise::Mailer"
+  config.mailer = "Devise::Mailer"
     config.mailer.default_url_options = { :host => 'glonass.htu.tuwien.ac.at' }  
   config.mailer.delivery_method = :sendmail
 #  config.mailer.smtp_settings = {
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8ebc3cf..e73fab7 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -16,7 +16,8 @@ de:
     studien: "Studien"
     news: "Neuigkeiten"
     info: "Information"
-
+    mitarbeiter: "Mitarbeiter"
+    fotos: "Fotos"
   formtastic:
     titles:
       modul: