Style, template changes

Gets us a step closer to the comps