content re-ordering and css tweaks