Fixing minor nav bugs