Tested and cleaned up button selectors