Substantial rework of Video app