Merge branch 'beta'
Merge in menu CSS

NOTE: This needs serious refactoring it’s very bloated for a simple menu
Remove use of strong for a class span
Cleaning and tidying

- Remove trailing spaces
- Fix some formatting
Merge branch 'master' into beta