Fix the layout, and fix translations' strings