added additional button handlers