Improvements

I've made some improvements on the template.
This pull request is here to update your fork.