Finished fixing nav bar