Fix routes
Small controller changes