View fixes

Closes #44