Graphic Improvements