diff --git a/app/controllers/rubriken_controller.rb b/app/controllers/rubriken_controller.rb
index 436b990..7ec78a9 100755
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -8,7 +8,7 @@ class RubrikenController < ApplicationController
       @rubriken = Rubrik.where(:public=>true)
     end   
     @neuigkeiten = @rubriken.collect(&:neuigkeiten).map(&:recent).flatten
-    @calentries= @rubriken.collect(&:calendar).collect(&:calentries).flatten
+    @calentries= @rubriken.collect(&:calentries).flatten
   end
   def intern
 
diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb
index 49c674b..a73c3ce 100644
--- a/app/models/fetprofile.rb
+++ b/app/models/fetprofile.rb
@@ -15,7 +15,7 @@
 #
 
 class Fetprofile < ActiveRecord::Base
-  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day,:birth_month, :birth_year,:geschlecht
+  attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname, :memberships_attributes, :remove_picture, :picture_cache, :plz, :street, :city, :instant,:skype, :telnr, :hdynr, :birth_day, :birth_month, :birth_year,:geschlecht
   has_many :memberships, dependent: :delete_all
   has_many :gremien, :through=> :membership
   mount_uploader :picture, PictureUploader
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 5ea2bde..078f445 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -20,16 +20,17 @@
     <% end %>
 
     <% @studium.semester.each do |sem| %>
-        <div class="row-fluid">
+    <div class="row-fluid">
       <div class="span12">
 	<div class="contentbox">
 	  <div class="container-fluid">
 	    <div class="row-fluid">
 	      
 	      <div class="span8">
-			    <h2><%= sem.name %></h2>
-	    </div>
-	    <div class="span4"><div class="pull-right"><%= link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%></div>
+		<h2><%= sem.name %></h2>
+	      </div>
+	      <div class="span4">
+<div class="pull-right"><!--<% link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>--></div>
 	    </div></div>
 	    <% sem.lvas.each do |lva| %>
 	      <div class="row-fluid">
diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb
index 69ac8dd..b10b28b 100644
--- a/app/views/themes/blue1/home/index.html.erb
+++ b/app/views/themes/blue1/home/index.html.erb
@@ -28,6 +28,10 @@
 
   </div>
   <%= link_to "Entwicklungsstatus" , dev_home_index_path %>
+  <p>  
+    <%= link_to "FAQS", faqs_themengruppen_path,class: :btn %>
+  </p>
+
   <%= render 'beispiele' %>
 </div>
 <div class="span6">
@@ -44,6 +48,7 @@ Verschiedene Styles
 <li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li>
 <li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li>
 </ul>
+
 </div>
 </div>
 </div>