Improve static page spec