Refined structure, added all pages (placeholders)