Added button toggling