variables for templates and small fixes for html