Issue #70 - More view cleanup