Improved rendering of switches & added visualization of local operated and resetting switches