Refactor buttons add