more button changes
fixed merge conflicts