Fix main menu
Add navigation