Add deactivated control state
Save
Capture device type value in data attribute
Complete button control and control states