second list view fixed
Merge branch 'master' into rayBranch