Switching over to UI buttons only