Automatic restart on language switch, adjusted layout of language options