View Fixes

Resolves issues #31, #33