Fixed pages and removed old ones