i18n fixes, layout, ...