fixing names, adding new pages