Final HTML changes