Done some refactoring and start with navbar