Changed up the menu and some routing