change layout and fix some problem with i18n