Updated/New Composer support for HTML_Page2

See diff for full changes