Includes the new 'Draw' button in the disable/enable button functions.