added navigation and some other stuff