refactored a lot of the old pages to the new ones