Fix the save/edit behavior
Move success modal div into a new html

Reviewer: Tiff Go
Issues: None