More layout and translations
And fix build....