Refactoring the JSPs.
Merge branch 'master' into release