continue refactoring content and upgrade menu to use waypoints to show current location