pieced together a better nav

needs refactoring