Updated html and jsp for new model
Merge branch 'mockup'