Improved controllers and locale