Cleanup.
Merge branch 'hotfix-topmenu-styles' into develop