Graphic improvements added