Fix sizing problems in layouts