Popup changes, added video popup etc
Merge remote-tracking branch 'origin/master'