diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
index a54f7a2f04f53f734f3d82ead47b46f036440786..ed84b16cf55cc4fb6f17bdfaa81bd7f9305a6c69 100644
--- a/app/views/timelog/_date_range.rhtml
+++ b/app/views/timelog/_date_range.rhtml
@@ -1,4 +1,4 @@
-<fieldset><legend><%= l(:label_date_range) %></legend>
+<fieldset id="filters"><legend><%= l(:label_date_range) %></legend>
 <p>
 <%= radio_button_tag 'period_type', '1', !@free_period %>
 <%= select_tag 'period', options_for_period_select(params[:period]),
@@ -7,11 +7,13 @@
 </p>
 <p>
 <%= radio_button_tag 'period_type', '2', @free_period %>
+<span onclick="$('period_type_2').checked = true;">
 <%= l(:label_date_from) %>
-<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
+<%= text_field_tag 'from', @from, :size => 10 %> <%= calendar_for('from') %>
 <%= l(:label_date_to) %>
-<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+<%= text_field_tag 'to', @to, :size => 10 %> <%= calendar_for('to') %>
+</span>
+<%= submit_tag l(:button_apply), :name => nil %>
 </p>
 </fieldset>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 27c7592f8da6a43a8d40be1150f164bc32c1984c..7c3e0fde7f277e3424f3e9f443d989a3b7af79bf 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,7 +159,9 @@ div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid
 p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 
-fieldset#filters .buttons { text-align: right; font-size: 0.9em; margin: 0 4px 0px 0; }
+fieldset#filters { padding: 0.7em; }
+fieldset#filters p { margin: 0.8em 0 0.8em 0; }
+fieldset#filters .buttons { text-align: right; font-size: 0.9em; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}