add sub views
Merge pull request #1 from LeiZeng/master

error handler and text on menu
Merge pull request #2 from kiddkai/master

upmerge