fixed some redirects to routes
used constants instead direct assignment