Reorganized the layout so that each page is in a separate file