#22 trying to clean up the navigation/menus