Fixed routes and added variable URL