Fixed some language and layout glitches