Add video model and view, some minor fixes