Changed some routes and UI
Resolved