Updates to video module and generic page layout styles/functionality
Resolving a conflit