Did some changes to menu and navigation