Add static pages and refactoring