Shaf/TomW: layout correctly