Fixed so all controls get disabled/enabled