Buttons refactored