Mayor style and layout changes

Please review and merge !!!