fix issue with routing
reaarange layout
route.navigation
Routes separated