Changes to views
Merge pull request #5 from kzhlin/branchA

Changes to views