ADD - Some graphic improvements