Some additions to the Button class again