diff --git a/test/buildbot/master/templates/change.html b/test/buildbot/master/templates/change.html
new file mode 100644
index 000000000..984c40bc4
--- /dev/null
+++ b/test/buildbot/master/templates/change.html
@@ -0,0 +1,15 @@
+{% import 'macros/forms.html' as forms %}
+{% from "macros/change.html" import change with context %}
+
+{% extends "layouts/base.html" %}
+{% block content %}
+
+<h1>{{ pageTitle }}</h1>
+
+{{ change(c) }}
+
+{% if authz.advertiseAction('stopChange') %}
+  <h3>Cancel Builds For Change:</h3>
+  {{ forms.stop_change_builds("/builders/_all/stopchangeall", c.number, authz) }}
+{% endif %}
+{% endblock %}
diff --git a/test/buildbot/master/templates/macros/change.html b/test/buildbot/master/templates/macros/change.html
index a288d09cf..b62bdafc1 100644
--- a/test/buildbot/master/templates/macros/change.html
+++ b/test/buildbot/master/templates/macros/change.html
@@ -1,46 +1,54 @@
 {% macro change(c) %}
 
-<table class="info">
-  {% set row_class=cycler('alt','') %}
-  <tr class="{{ row_class.next() }}">
+<table class="zebra-striped">
+  <tbody>
+  <tr>
     <td class="left">Changed by</td>
     <td><b>{{ c.who|email }}</b></td>
   </tr>
-  <tr class="{{ row_class.next() }}">
+
+  <tr>
     <td class="left">Changed at</td>
     <td><b>{{ c.at }}</b></td>
   </tr>
 
   {% if c.repository %}
-  <tr class="{{ row_class.next() }}">
+  <tr>
     <td class="left">Repository</td>
     <td><b>{{ c.repository|repolink }}</b></td>
   </tr>
-  {% endif %} {% if c.project %}
-  <tr class="{{ row_class.next() }}">
+  {% endif %}
+
+  {% if c.project %}
+  <tr>
     <td class="left">Project</td>
     <td><b>{{ c.project|projectlink }}</b></td>
   </tr>
-  {% endif %} {% if c.branch %}
-  <tr class="{{ row_class.next() }}">
+  {% endif %}
+
+  {% if c.branch %}
+  <tr>
     <td class="left">Branch</td>
     <td><b>{{ c.branch|e }}</b></td>
   </tr>
-  {% endif %} {% if c.rev %}
-  <tr class="{{ row_class.next() }}">
+  {% endif %}
+
+  {% if c.rev %}
+  <tr>
     <td class="left">Revision</td>
     <td>{%- if c.revlink -%}<a href="{{ c.revlink }}">{{ c.rev|e }}</a>
     {%- else -%}{{ c.rev|revlink(c.repository) }} {%- endif -%}</td>
   </tr>
   {% endif %}
+  </tbody>
 </table>
 
 {% if c.comments %}
 <h3>Comments</h3>
-<pre class="comments">{{ c.comments|changecomment(c.project) }}</pre>
+<pre>{{ c.comments|changecomment(c.project) }}</pre>
 {% endif %}
 
-<h3 class="files">Changed files</h3>
+<h3>Changed files</h3>
 <ul>
   {% for f in c.files -%}
   <li class="{{ loop.cycle('alt', '') }}">{%- if f.url %}<a
@@ -56,9 +64,9 @@
 
 {% if c.properties %}
 <h3>Properties</h3>
-<table class="info">
+<table class="zebra-striped">
   {% for p in c.properties %}
-  <tr class="{{ loop.cycle('alt') }}">
+  <tr>
     <td class="left">{{ p[0]|capitalize|e }}</td>
     <td>{{ p[1]|e }}</td>
   </tr>
diff --git a/test/buildbot/master/templates/waterfall.html b/test/buildbot/master/templates/waterfall.html
index d4b702cd4..5293f834c 100644
--- a/test/buildbot/master/templates/waterfall.html
+++ b/test/buildbot/master/templates/waterfall.html
@@ -25,9 +25,9 @@
     <tr>
       <th colspan="2">Current Activity</th>
       {% for b in builders %}
-      <th class="{{ b.status_class }}">
+      <td class="{{ b.status_class }}">
         {{ "<br />".join(b.status) }}
-      </th>
+      </td>
       {% endfor %}
     </tr>