Tidy-up of unused header content and wrappers
Improve display of map
Position map beneath other elements