Fix toggle switches and add summary