Improve site variables
Improve handlebars