New button designs

Holding this open for review at the moment.
Minor annoyances.  Let me know if you want me to follow up with another PR, if you don't want to deal with my minor nits.
```javascript
function sortOptionFields(optionFields) {
  return optionFields.sort(function (a, b) {
    return a.displayOrder - b.displayOrder;
  });
}
```