clean up video views, misc fixes
Merge pull request #40 from lukesteensen/video-fixes

clean up video views, misc fixes