Update the View based on Wei's advice
Merge branch 'master'