Fix the add new control modal and try to reset the modal state on close

Doesn't quite work well enough, the animation is not restarted after close