added a couple of new button types