Add missing items, fix HTML issues