Changed switch and click buttons