reworked the nav
reworking stuff