Fixing final Nav issue