REfactoring buttons