Put header back, tidy up profile and dashboard pages