Modal and edit modal changes