diff --git a/rowers/forms.py b/rowers/forms.py
index 7de91fdb..05fc77a8 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -27,7 +27,12 @@ class LoginForm(forms.Form):
 
 # search form
 class SearchForm(forms.Form):
-    q = forms.CharField(max_length=255,required=False,initial='Search')
+    q = forms.CharField(max_length=255,required=False,
+                        widget=forms.TextInput(
+                            attrs={'placeholder': 'Search'}),
+                        label='Search')
+
+    
     
 # simple form for Contact page. Sends email to info@rowsandall.com
 class EmailForm(forms.Form):
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index a46e7fdd..2ccb8c53 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -85,9 +85,9 @@
         {% else %}
         <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
               method="get" accept-charset="utf-8">
-          {% endif %}    
-          <input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
-          <input type="submit">
+          {% endif %}
+          {{ searchform }}
+          <input type="submit" value="GO">
         </input>
         </form>
     </p>