Styling + fix some XML handling