Rejigger html a bit