Revert "Revert "Size adjustments and i18n""

This reverts commit 10ad3c9ec8f4d1dced1e5fa4f5823037ee07827b.