Partial HTML tested, fixed