Improve gfx