diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss
index cd308e35e2..385c0c6529 100644
--- a/resources/www/lightbox/styles/main.scss
+++ b/resources/www/lightbox/styles/main.scss
@@ -589,3 +589,7 @@ hr {
   background-image: none;
   border: none;
 }
+.videoTips {
+  width: 100%;
+  height: 100%;
+}
diff --git a/resources/www/prod/skins/skin-shared.scss b/resources/www/prod/skins/skin-shared.scss
index 6360c94710..dd486bbe8d 100644
--- a/resources/www/prod/skins/skin-shared.scss
+++ b/resources/www/prod/skins/skin-shared.scss
@@ -518,6 +518,10 @@ h4 {
     }
   }
 }
+.videoTips {
+  width: 100%;
+  height: 100%;
+}
 
 @import 'ui-components/jquery-ui';
 @import 'ui-components/context-menu';
diff --git a/templates/web/common/caption.html.twig b/templates/web/common/caption.html.twig
index 4e06972df6..811bd6181b 100644
--- a/templates/web/common/caption.html.twig
+++ b/templates/web/common/caption.html.twig
@@ -9,7 +9,7 @@
     {{ macro.caption(record, business, display_exif) }}
 {% elseif view == 'preview' %}
     {% set display_exif = false %}
-    {{ macro.caption(record, business, display_exif) }}
+    {{ macro.caption(record, business, display_exif, true) }}
 {% elseif view == 'basket' %}
     {% set display_exif = false %}
     {{ macro.caption(record, business, display_exif) }}
diff --git a/templates/web/common/macros.html.twig b/templates/web/common/macros.html.twig
index fba7aa281e..79d60d40a8 100644
--- a/templates/web/common/macros.html.twig
+++ b/templates/web/common/macros.html.twig
@@ -116,8 +116,8 @@
     {% endif %}
 {% endmacro %}
 
-{% macro caption(record, can_see_business, display_exif) %}
-    <dl class="dl-horizontal">
+{% macro caption(record, can_see_business, display_exif, limitedWidth = false) %}
+    <dl class="{% if limitedWidth %}{% else %}dl-horizontal{% endif %}">
     {% for name, value in record.getCaption(caption_field_order(record, can_see_business)) %}
         <dt>{{ name }}</dt>
         <dd>{{ caption_field(record, name, value)|e|highlight }}</dd>
diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig
index 43fc7f5e99..965083321d 100644
--- a/templates/web/lightbox/feed.html.twig
+++ b/templates/web/lightbox/feed.html.twig
@@ -81,7 +81,7 @@
                         <div class="lightbox_container PNB">
               {% set business = app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %}
               {% if first_item %}
-                {{macro.caption(first_item.getRecord(app), business, false)}}
+                {{macro.caption(first_item.getRecord(app), business, false, true)}}
               {% endif %}
             </div>
                     </div>
diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig
index f31e85aa4b..a785e7bc53 100644
--- a/templates/web/lightbox/validate.html.twig
+++ b/templates/web/lightbox/validate.html.twig
@@ -95,7 +95,7 @@
                         <div class="lightbox_container PNB">
               {% if basket_element %}
                 {% set business =  app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(basket_element.getRecord(app).get_base_id(), 'canmodifrecord') %}
-                {{macro.caption(basket_element.getRecord(app), business, false)}}
+                {{macro.caption(basket_element.getRecord(app), business, false, true)}}
               {% endif %}
             </div>
                     </div>