A lot of layout (simple) fixes, language update as well.
Merge remote-tracking branch 'origin/LanguageUpdates'