Fixed bug in unsaved changes signal lights; added a little more IoC/DI.