Major code refactoring, finished navbar part