Front page HTML now generated from a template
Includes second item in functional test
Functional test refactor