More tweaks for QuickLayout