Refactoring templates, and adding more styling.