Updates to get things working again, and general code cleanup
updates to improve resiliance and get rid of issues with deactivation
Merge branch 'master' of git@github.com:DawnScience/dawn-ui.git