2 files changed, 10 insertions, 4 deletions

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 69db939..0b32673 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,6 +14,16 @@
       <div id="header">
         <%= image_tag "header.png" %>
       </div>
+      <div id="search">
+        <table>
+        <% form_tag search_path, :method => 'get' do %>
+          <tr>
+            <td><%= text_field_tag :search_term %></td>
+            <td style="padding-top: 2px"><%= image_submit_tag("search_button.png") %></td>
+          </tr>
+        <% end %>
+        </table>
+      </div>
       <div id="left_column">
         <%= main_menu %>
         
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 2e46d20..28764bf 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -1,9 +1,5 @@
 <h2>Suche</h2>
 
-<% form_tag search_path, :method => 'get' do %>
-  <%= text_field_tag :search_term %>
-  <%= submit_tag "Suchen" %>
-<% end %>
 
 
 <% if params[:search_term] %>