ViewFixes
Merge pull request #43 from SW3-P3/corlin

ViewFixes