refactored buttons, cleaned some things up