|#1501| fixing bug - success message now not visible on clicking cancel, and removed an extra id