HTML template adjustments and cleanup