Bugfix
Finished changing navigation