sub view and subsequent refactoring around sub views
cleanup
Merge pull request #5 from zhujy8833/refactor

Refactor