made a lot of changes to the navigation bar code