folderViewImprovement-wangyu: ->wangfeng

fix two bugs of folder mode view and make some improvement