Refactoring Navbar

- Singleton instead of static methods
- Renaming some methods