diff --git a/years/2020/whoandwhen.html b/years/2020/whoandwhen.html
index 2c41a684f..23a711332 100644
--- a/years/2020/whoandwhen.html
+++ b/years/2020/whoandwhen.html
@@ -13,78 +13,174 @@ table.fancy td.nonempty { background: #eee }
<body>
<h1>Expo 2020: Who and When</h1>
-
<p>This page says who is coming, when and how.</p>
-
-<p>Fill yourself in in the top who/dates table. Hopefully the formatting is fairly obvious.</p>
-
+<p>Fill yourself in in the top who/dates table. Hopefully the formatting is fairly obvious. (You'll need to use the 'HTML' button to add a new row if there are no empty rows.)</p>
<h3>Howto</h3>
-
<p>Use the 'Edit this page' button to the left. You will need to log in to do that. Clicking will show a login page if you are not yet logged in. Log in as 'expo' with the normal expo 'cavey:beery' password (ask someone in person or by phone call, or other secure means (not uncrypted email or SMS) if you don't know it - it's important that it's never put in plain-text email, because if it is this site/machine will get hacked).</p>
-
<p>You can also edit this page like any other on the website using mercurial or tortoise hg if you have that set up (see Expo Handbook for details)</p>
-
<h2>People</h2>
<table class="fancy">
- <tr>
- <th>Name </th>
- <th>Duration </th>
- <th>Week1<br>Jul 16-22</th>
- <th>Week2<br>Jul 23-29</th>
- <th>Week3<br>Jul 30-Aug 5</th>
- <th>Week4<br>Aug 6-12</th>
- <th>Week5<br>Aug 13-20</th>
- <th>Deposit</th>
- <th>Comments</th>
- </tr>
- <tr>
- <td>Someone</td>
- <td>3 weeks</td>
- <td>no</td>
- <td>no</td>
- <td>yes</td>
- <td>yes</td>
- <td>yes</td>
- <td>Paid</td>
- <td>Comment...</td>
- </tr>
-
- </tr></table>
-
-
+<tbody>
+<tr><th>Name </th><th>Duration </th><th>Week1<br />Jul 16-22</th><th>Week2<br />Jul 23-29</th><th>Week3<br />Jul 30-Aug 5</th><th>Week4<br />Aug 6-12</th><th>Week5<br />Aug 13-20</th><th>Deposit</th><th>Comments</th></tr>
+<tr>
+<td>Someone</td>
+<td>3 weeks</td>
+<td>no</td>
+<td>no</td>
+<td>yes</td>
+<td>yes</td>
+<td>yes</td>
+<td>Paid</td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+</tbody>
+</table>
<h2>Transport</h2>
-
<p>Fill in modes and dates if known</p>
-
<h3>List of vehicles</h3>
<ul>
-<li><b>Car 1</b>: </li>
-<li><b>Car 2</b>: </li>
-<li><b>Car 3</b>: </li>
+<li><strong>Car 1</strong>:</li>
+<li><strong>Car 2</strong>:</li>
+<li><strong>Car 3</strong>:</li>
</ul>
<table class="fancy">
- <tr>
- <th rowspan="2">Who </th>
- <th colspan="2">Out</th>
- <th colspan="2">Back</th>
- <th rowspan="2">Comments</th>
- </tr>
- <tr>
- <th>Mode</th>
- <th>Date</th>
- <th>Mode</th>
- <th>Date</th>
- </tr>
- <tr>
- <td>Someone</td>
- <td>Car 1</td>
- <td>Jul 19th</td>
- <td>Car 1</td>
- <td>Aug 20th </td>
- <td>Comment...</td>
- </tr>
-
-</table>
-
-</body>
+<tbody>
+<tr><th rowspan="2">Who </th><th colspan="2">Out</th><th colspan="2">Back</th><th rowspan="2">Comments</th></tr>
+<tr><th>Mode</th><th>Date</th><th>Mode</th><th>Date</th></tr>
+<tr>
+<td>Someone</td>
+<td>Car 1</td>
+<td>Jul 19th</td>
+<td>Car 1</td>
+<td>Aug 20th</td>
+<td>Comment...</td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+<tr>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+<td> </td>
+</tr>
+</tbody>
+</table></body>
</html>