Merge "Use proper divider asset and margins."