Split into components, added two pages with placeholders