Worked on navigation

Looks much better now! Also fixed a bug, which made to show the main
menu instead of the sub menu.