Merge branch 'development'

Update the UI to show all videos available by webpage