Some layout and 'h' tag tweaks