added proper back navigation and menu items