Integrated Rujul's changes:

Fixed view videos template