SSP-2488 MessageTemplates Cancel fixed
SSP-2491 Ongoing form layout adjustment