Merge pull request #7 from CalvertYang/master

Merge code
completed all view
Merge pull request #7 from AndyYou/master

completed all view