Tidied up header bar and main menu, started work
on right column