CLO-588 worked on enable/disable button, subject update