some html simplifications, reducing the number of <td>...</td> tags