Updated/New Composer support for HTML_Page

See diff for full changes