bugfixing the nav
merging conflict