refactor buttons pt2