Dragon visual improvements

Not complete.