some more tweaks on layouts (especially closing layout)