finishing HTML changes, tests passing