Graphics enhancements

Change-Id: I354bb048844ca87b3d034895efb1e085ada9c06b