Buttons

Cleaned up merge that went awry in #29