Changed up the html/added mashup pages.