Changed layout because I'm not going in order
Added moar template files