adjust button result page, fix bugs