Moving video to top of card for video cards
Fixing merge conflict