Moved all on/off toggle to own line