Working on making things pretty
Committing template changes.