ZWave update
Scenes z-index fix