Models changed a little bit, and formalized the layouts for the templates a bit more. Still not much in the way of styling, but that will come later.