Added navigation and some refactoring