[Improved] Do a little refactor on static page spec