Separate pages into their own files and simplify the code to highlight
current two issues.