Some updates to graphics

Change-Id: Id92a4acc3642b06b41310836d45288187d4fa950