diff --git a/app/inputs/datepicker_input.rb b/app/inputs/datepicker_input.rb
index 9ebb90a..1c2abe8 100644
--- a/app/inputs/datepicker_input.rb
+++ b/app/inputs/datepicker_input.rb
@@ -1,23 +1,28 @@
 class DatepickerInput < FormtasticBootstrap::Inputs::StringInput
 	def input_html_options
-		super.merge(:class => "input-append date")
+		super
+		#super.merge(:class => "input-append date")
 	end
 	def html_options
-		super.merge(:default => Date.today)
+		super
+		#super.merge(:default => Date.today)
 	end
 	def wrapper_html_options
-		super.merge(:class=>"datepicker",'date-date-format'.to_sym=>"%d.%m.%Y")
+		super.merge(:class=>"")
+		#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)
+	super.merge(:class=> "datepicker date input-append", 'data-date'.to_sym =>I18n.l(Date.today()).to_s, 'data-date-format'.to_sym=>I18n.t('date.formats.default-picker'))
+	end
+	def to_html
+		bootstrap_wrapping do
+           	builder.text_field(method, input_html_options) +
+	   	'<span class="add-on" ><i class="icon-th"></i></span>'.html_safe()
+	end
 	end
-	#def to_html
-	#	bootstrap_wrapping do
-     #       builder.text_field(method, input_html_options)
-	#	end
-	#end
 	def options
-		super#d.merge(:class=>"datepicker")
+		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
diff --git a/app/views/calentries/_form.html.erb b/app/views/calentries/_form.html.erb
index 6e2380a..0799acc 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, :append=>'sadf'  %>
+    <%= f.input :start , :as => :datepicker, :append=>'sadf'  %>
  </div>
  <div class="span6">
     <%= f.input :ende , :as => :datepicker %>
@@ -23,9 +23,9 @@
  </div>
  </div>
   <% end %>
+<script>$('.datepicker').datepicker() </script>
   <div class="row-fluid">
-		  <script>$('.datepicker').datepicker()</script>  
-
+		
   <div class="span12">
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
diff --git a/config/locales/date.de.yml b/config/locales/date.de.yml
index c4004ef..510c5a2 100644
--- a/config/locales/date.de.yml
+++ b/config/locales/date.de.yml
@@ -32,6 +32,7 @@ de:
     - Samstag
     formats:
       default: ! '%d.%m.%Y'
+      default-picker: ! 'dd.mm.yyyy'
       long: ! '%e. %B %Y'
       short: ! '%e. %b'
     month_names: