Button refactoring phase 1