reorganized routes
fixed navigation route