HTML fixes - moving some elements and classes