Added button and controller