added Buttons, ButtonListener, set/get methods