added navigation and different routing