Multiple fixes to video layout & tweaks