CRM-13627 - Layout tweaks