some html structure tweaks