fix issue #59. And deal with real button not div, plus fix other small stuff