Better orchestration of control activating/removal
Merge pull request #146 from isuftin/master

UI control orchestration