Fixed category plurality
Implemented a new menu for desktop, and modified the menu for small screens.
Merge branch 'feature/menu' into develop