Added button and buttonlogic