Moved: Fixing up some html