Better i18n
Small desing fixes