More fixes with the layouts