fixed layouts and trying a fix for github build