added navigation, added routes and states