Clean up Xml export and initial HTML rendering