added all pages and fixed each