Added html-boilerplate and better templating