added new page and fixed bugs