More progress on form to extend runtime
Start migrating HTML pages to using layout.html for base