Cheap patch to fix some layouts