Added menu and some navigation