CRM-11864 - replacing stale PR-3101 with additional layout improvements.