Eyecandy fixes

Eyecandy fixes