Improved Video component. Closes #38