Bugfixes with video view