Update button code and disable/enable, clean up brackets