improving enabling/disabling of controls