Some graphic enhancements