WIP commit - changed fonts and lots of layout, still working on templates