Fix in makemessages refactoring plus UI tweaks.