fixes to navigation menu bugs