redid the navigation the proper way