Update translation and fix layout