Adding templates and styling
minor tweaks