Refactor buttons