Size adjustments and i18n
Revert "Size adjustments and i18n"

This reverts commit 7e14dd4a74e3c023170507247ac6bc4ca39d93c3.