updated for footer.tmpl.html
updated for merged