View fixes
Fixes #29
View fixes