Tyler's view fixes
Merge pull request #1 from Vector919/tyler_hack

Tyler's view fixes