CLO-588 worked on the enable/disable buttons