Added button control (not working yet)