Improved localization and UI