More precise manangement of controls activation/deactivation