Updates, Dec 20

Broke out layout, have all pages.