Code refactoring
Update the UI for secondary videos
Update the UI