Issue #77 - view cleanup and spec fixes.