Change the video pager to 3up and change the preview image format (included).
Fix merge conflict.