refactored buttons, etc