Finish more static pages work