Merge pull request #573 from youyong205/master

modify the jsp
review & fix issue
Merge pull request #575 from jialinsun/master

review & fix issue
Merge pull request #576 from youyong205/master

refactor