Finish static pages and tests
its an ugly commit'