diff --git a/.geanyprojekt b/.geanyprojekt
index 2beb69d..26ae794 100644
--- a/.geanyprojekt
+++ b/.geanyprojekt
@@ -23,7 +23,7 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=19
+current_page=22
 FILE_NAME_0=291;Ruby;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fcontrollers%2Frubriken_controller.rb;0;4
 FILE_NAME_1=334;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Fgremien%2Fshow.html.erb;0;4
 FILE_NAME_2=0;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Fcalentries%2Findex.html.erb;0;4
@@ -46,6 +46,12 @@ FILE_NAME_18=722;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews
 FILE_NAME_19=747;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Frubriken%2Fverwalten.html.erb;0;4
 FILE_NAME_20=72;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Frubriken%2Falle_verwalten.html.erb;0;4
 FILE_NAME_21=680;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Frubriken%2Fshow.html.erb;0;4
+FILE_NAME_22=387;Ruby;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Finputs%2Fdatepicker_input.rb;0;4
+FILE_NAME_23=656;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Fcalentries%2F_form.html.erb;0;4
+FILE_NAME_24=762;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Fcalendars%2Fshow.html.erb;0;4
+FILE_NAME_25=1385;None;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2FGemfile;0;4
+FILE_NAME_26=610;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Ffetprofiles%2F_tabs.html.erb;0;4
+FILE_NAME_27=0;HTML;0;16;1;1;0;%2Fhome%2Fandreas%2Fwww%2Ffetsite%2Fapp%2Fviews%2Ffetprofiles%2F_form.html.erb;0;4
 
 [gproject]
 source_patterns=*.rb;*.erb;
diff --git a/Gemfile b/Gemfile
index 0ad052a..2ae738c 100755
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'jquery-rails'
 
 # Formbuilder for easier form generation
 gem 'formtastic', '~>2.2.1'
-gem 'formtastic-bootstrap'
+gem 'formtastic-bootstrap' , :git => "git://github.com/mjbellantoni/formtastic-bootstrap.git"
 # TinyMCE
 gem "tinymce-rails" , '>=3.5.8'
 
@@ -72,7 +72,7 @@ gem 'haml'
 #gem 'gollum'
 gem 'awesome_nested_set'
 gem 'annotate', ">=2.5.0"
-gem 'carrierwave'
+gem 'carrierwave', "~>0.9.0"
 group :development, :test do 
 gem 'factory_girl_rails'
 gem 'rspec-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index e7fc484..d4c61fb 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/mjbellantoni/formtastic-bootstrap.git
+  revision: 23c3dcdbd9cd583d95b9c2019dd66302a9206c87
+  specs:
+    formtastic-bootstrap (2.1.3)
+      formtastic (~> 2.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -71,9 +78,6 @@ GEM
       multipart-post (~> 1.2.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    formtastic-bootstrap (2.0.0)
-      formtastic (~> 2.2)
-      formtastic-bootstrap
     git (1.2.5)
     globalize3 (0.3.0)
       activemodel (>= 3.0.0)
@@ -208,13 +212,13 @@ DEPENDENCIES
   bootstrap-addons-rails
   bootstrap-sass (~> 2.3.2.1)
   cancan
-  carrierwave
+  carrierwave (~> 0.9.0)
   coffee-rails (~> 3.2.1)
   devise (~> 2.2.3)
   execjs (~> 1.4.0)
   factory_girl_rails
   formtastic (~> 2.2.1)
-  formtastic-bootstrap
+  formtastic-bootstrap!
   git
   globalize3 (~> 0.3.0)
   haml
diff --git a/app/inputs/datepicker_input.rb b/app/inputs/datepicker_input.rb
index e91e71c..9ebb90a 100644
--- a/app/inputs/datepicker_input.rb
+++ b/app/inputs/datepicker_input.rb
@@ -1,6 +1,24 @@
 class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
 	def input_html_options
-		super.merge(:class => "datepicker")
+		super.merge(:class => "input-append date")
+	end
+	def html_options
+		super.merge(:default => Date.today)
+	end
+	def wrapper_html_options
+		super.merge(:class=>"datepicker",'date-date-format'.to_sym=>"%d.%m.%Y")
+	end
+	def controls_wrapper_html_options
+		super.merge(:class=> "controls", 'date-date'.to_sym =>Time.now.to_date.to_s)
+	end
+	#def to_html
+	#	bootstrap_wrapping do
+     #       builder.text_field(method, input_html_options)
+	#	end
+	#end
+	def options
+		super#d.merge(:class=>"datepicker")
+		#super.merge(:append_content=>'<span class="add-on input-append"
+		#super.merge(:append_content=>'<span class="add-on" ><i class="icon-th"></i></span>')
 	end
-	
 end
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index 3b43bfc..11a4657 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -17,14 +17,14 @@
 <ul class="list-group">
 <% @calendar.calentries.each do |entry| %>
 <li class="list-group-item">
-<%= link_to entry.summary+ " - " + I18n.l(entry.start1), entry %>
+<%= link_to entry.summary.to_s+ " - " + I18n.l(entry.start1), entry %>
 </li>
 <% end %>
 </ul>
 </div>
  <div class="row-fluid">
 <%= calendar @calendar.calentries do |entry| %>
-  <div><%= link_to entry.name, entry %></div>
+  <div><%= link_to entry.name.to_s, entry %></div>
 <% end %>
 </div>
  <div class="row-fluid">
diff --git a/app/views/calentries/_form.html.erb b/app/views/calentries/_form.html.erb
index f82c63b..6e2380a 100644
--- a/app/views/calentries/_form.html.erb
+++ b/app/views/calentries/_form.html.erb
@@ -3,7 +3,7 @@
   <%= f.inputs do %>
  <div class="row-fluid">
  <div class="span6">
-    <%= f.input :start , :as => :date_string %>
+    <%= f.input :start , :as => :date_string, :append=>'sadf'  %>
  </div>
  <div class="span6">
     <%= f.input :ende , :as => :datepicker %>
@@ -11,7 +11,7 @@
  </div>
  <div class="row-fluid">  
  <div class="span12">
-    <%= f.input :summary %>
+    <%= f.input :summary, :append=>'g' %>
  </div>
  </div>
  <div class="row-fluid">
@@ -23,7 +23,9 @@
  </div>
  </div>
   <% end %>
-  <div class="row-fluid"><script>$('.datepicker').datepicker()</script>
+  <div class="row-fluid">
+		  <script>$('.datepicker').datepicker()</script>  
+
   <div class="span12">
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
@@ -32,4 +34,4 @@
   </div>
 <% end %>
 </div>
-<script>$('.datepicker').datepicker()</script>
+
diff --git a/app/views/fetprofiles/_tabs.html.erb b/app/views/fetprofiles/_tabs.html.erb
index e9162c1..2359bc7 100644
--- a/app/views/fetprofiles/_tabs.html.erb
+++ b/app/views/fetprofiles/_tabs.html.erb
@@ -13,12 +13,12 @@
 
 
 <% if can?(:verwalten,Gremium) %>
-<% if request.fullpath == gremien_path %>
+<% if request.fullpath == verwalten_gremien_path %>
   <li class="active pull-right">
   <% else %>
   <li class="pull-right">
 <% end %>
-<%= link_to "Verwaltung", gremien_path %>
+<%= link_to "Verwaltung", verwalten_gremien_path %>
 </li>
 <% end %>
 </ul>