fixed the navigation routes and user form