Fixed routes
Added editable Video fields.
Merged upstream video changes.