diff --git a/codalab/apps/web/templates/web/competitions/_results.html b/codalab/apps/web/templates/web/competitions/_results.html
index 14cbc20a8..e43a8e42b 100644
--- a/codalab/apps/web/templates/web/competitions/_results.html
+++ b/codalab/apps/web/templates/web/competitions/_results.html
@@ -1,14 +1,13 @@
-<div class="row">
-	<div class="small-4 columns push right">
-		<div class="row">
-      <div class="globalBlueButton phaseToggleBtn lFloat">
-       <a href="#">Phase 1</a> 
-     </div>
-     <div class="globalBlueButton phaseToggleBtn lFloat">
-       <a href="#">Phase 2</a> 
-     </div>
-   </div>
- </div>
+<div class="row right">
+  <div class="small-12 columns">
+    {% for phase in competition.phases.all %}
+      {% if not phase.is_active %}
+        <button class="globalBlueButton disabled" id="phase_{{phase.id}}">{{phase.label}}</button>
+      {% else %}
+        <button class="globalBlueButton" id="phase_{{phase.id}}">{{phase.label}}</button>
+      {% endif %}
+    {% endfor %}
+  </div>
 </div>
 
 <div class="row">
@@ -25,6 +24,7 @@
         </tr>
       </thead>
       <tbody>
+        
         <tr>
           <td>1</td>
           <td>guest2</td>
diff --git a/codalab/apps/web/templates/web/competitions/_submit_results.html b/codalab/apps/web/templates/web/competitions/_submit_results.html
index e0184b17f..9bc3e6192 100644
--- a/codalab/apps/web/templates/web/competitions/_submit_results.html
+++ b/codalab/apps/web/templates/web/competitions/_submit_results.html
@@ -1,23 +1,25 @@
 {% load codalab %}
-<div class="row">
-	<div class="small-4 columns push right">
-		<div class="row">
-      <div class="globalBlueButton phaseToggleBtn lFloat">
-       <a href="#">Phase 1</a> 
-     </div>
-     <div class="globalBlueButton phaseToggleBtn lFloat">
-       <a href="#">Phase 2</a> 
-     </div>
-   </div>
- </div>
-</div>
-
-<p>Submit a new result set or view your previous submissions.</p>
 
+<div class="row right">
+  <div class="small-12 columns">
+    {% for phase in competition.phases.all %}
+      {% if not phase.is_active %}
+        <button class="globalBlueButton disabled" id="phase_{{phase.id}}">{{phase.label}}</button>
+      {% else %}
+        <button class="globalBlueButton" id="phase_{{phase.id}}">{{phase.label}}</button>
+      {% endif %}
+    {% endfor %}
+  </div>
+</div>
+<div class="row"
+  <p>Submit a new result set or view your previous submissions.</p>
+</div>
+<div class="row">
   <input type="file" name="file" id="fileUpload" class="fileUpload" />
   <div id="details"></div>
   <div id="response"></div>
   <div id="previews"></div>
+</div>
 
 <div class="row">
   <div class="user_results">
diff --git a/codalab/apps/web/templatetags/codalab.py b/codalab/apps/web/templatetags/codalab.py
index 64bbf5e7f..28515a5b4 100644
--- a/codalab/apps/web/templatetags/codalab.py
+++ b/codalab/apps/web/templatetags/codalab.py
@@ -1,10 +1,13 @@
 import os
-
 from django import template
 
-
 register = template.Library()
 
 @register.filter
 def filename(value):
-    return os.path.basename(value.file.name)
\ No newline at end of file
+    return os.path.basename(value.file.name)
+
+# by mikeivanov (on April 16, 2007)
+@register.filter
+def in_list(value,arg):
+   return value in arg
\ No newline at end of file