Refactor
Rename buttons