Some graphic improvements