Changed routes for better UI