Fixed bug in video templates
Cleanup Video class
Added insertVideo to VideoFactory