Fixed controls, fixed video re-init