Organized and refactored pages to exactly match the wireframes