Added some new graphics, implemented much of HTML editing and merging