fixed bugs on views
Merge branch 'finish-lab3'
fixed views bugs