Removed logic from router
Fixed menu selection