Change layout and better transliteration