added static
updated templates with correct markup