Fix header css and tidy up