Added popup switches to scenes