Reorganized view templating, should consider a different templating engine like velocity or freemarker