add switch and drawer