added navigation, fixed bug with routes