cleaned up code, expanded the navigation