Modifed the pages and fixed bugs