diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index d3408fa9..d212ab6b 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -4,8 +4,9 @@
     
     <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.id) if @project %>
+    <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    <div class="contextual">
+    <div class="buttons">
     <%= link_to_remote l(:button_apply), 
                        { :url => { :set_filter => 1 },
                          :update => "content",
@@ -21,8 +22,7 @@
     <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
     <% end %>
     </div>
-    <br />
-    &nbsp;
+    </fieldset>
     <% end %>
 <% else %>
     <div class="contextual">
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml
index 8d3da7f6..1a481ada 100644
--- a/app/views/queries/_columns.rhtml
+++ b/app/views/queries/_columns.rhtml
@@ -1,8 +1,8 @@
 <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
 
-<%= hidden_field_tag 'query[column_names][]', '' %>
-<table margin=0>
+<%= hidden_field_tag 'query[column_names][]', '', :id => nil %>
+<table>
 	<tr>
 		<td><%= select_tag 'available_columns',
 		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 2465818d..458d7139 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -56,7 +56,6 @@ function toggle_multi_select(field) {
 //]]>
 </script>
 
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <table width="100%">
 <tr>
 <td>
@@ -100,4 +99,3 @@ function toggle_multi_select(field) {
 </td>
 </tr>
 </table>
-</fieldset>
\ No newline at end of file
diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml
index 1620d9b0..2d4b96fd 100644
--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
@@ -16,6 +16,9 @@
       :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
 </div>
 
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+</fieldset>
+
 <%= render :partial => 'queries/columns', :locals => {:query => query}%>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 816cd05a..a0d5deb2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,6 +159,9 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 
+#filters { margin-bottom: 1em; }
+#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;}
 div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }