Initial changes to HTML
More HTML changes