Improved controllers and urls