changed video handling to compensate size vs images
git merge result with escape support