Split out button methods

Buttons are added as needed.  Still need to gro the selector and go with
an object.