Updated html and jsp templates