more layout and language changes