CRM-12466, layout fix and added inline help