Merge pull request #33 from nubs/master

Reuse the video container for preview.