Added page navigation and cleaned up some pages