Improve StaticPages