redesigned those ugly switches