Even more updates to the main templates, front-end is almost completely running! Just needs a few more pages.