i18n, readapt and rearrang to make it work nice with new html code