More work on editor rendering