More general improvements all over
Wiring up the dialog actions & more DRYing up.