Added clear and rescan

Added clear and rescan button (forgot initially). Also switch checkbox
to toggle switch.