Working on nav
More Nav edits