Add namespace and fix up drawing.