guideline layout improvements