Add proper namespace rendering and cosmetic changes.