Modified main button handlers