More Graphic improvements