#59: moved the anchor into the cell. Some more html cleanup on the way