refactor buttons to fix #54 and fix #55