Preliminary rewrite of HTML output - homepage