Completed subpage layout and refactored demo.html a bit.