better naming of navigationbar
small html refactoring