More changes, added more HTML