Names of buttons and handlers corrected