Bug Fixes

Values reset properly on clearing and switching between dialogs. Close
button works as intended.