Finish static pages part 2