Unify more controls