Updates to template
Awesomeness in the making