Updated button enable / disable logic.