Refactor buttons...