Made video fill the entire frame
Fixed merge conflicts