Next wave of localization together with some layout fixes