diff --git a/apps/course/templates/course/content/image.html b/apps/course/templates/course/content/image.html
index 76fa1b78..5daeba4e 100644
--- a/apps/course/templates/course/content/image.html
+++ b/apps/course/templates/course/content/image.html
@@ -1,6 +1,6 @@
-<div>
+<div class="content-block title">
   {{ content.title }}
 </div>
 <div>
-  <img src="{{ content.img.image.url }}" alt="">
+  <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
 </div>
\ No newline at end of file
diff --git a/apps/course/templates/course/content/imagetext.html b/apps/course/templates/course/content/imagetext.html
index f3b4f3d0..f2118327 100644
--- a/apps/course/templates/course/content/imagetext.html
+++ b/apps/course/templates/course/content/imagetext.html
@@ -1,9 +1,9 @@
-<div>
+<div class="content-block title">
   {{ content.title }}
 </div>
-<div>
-  {{ content.text }}
+<div class="content-block text">
+  {{ content.txt }}
 </div>
 <div>
-  <img src="{{ content.img.image.url }}" alt="">
+  <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
 </div>
\ No newline at end of file
diff --git a/apps/course/templates/course/content/text.html b/apps/course/templates/course/content/text.html
index b9bdb94d..40b9ae0e 100644
--- a/apps/course/templates/course/content/text.html
+++ b/apps/course/templates/course/content/text.html
@@ -1,6 +1,6 @@
-<div>
+<div class="content-block title">
 {{ content.title }}
 </div>
-<div>
+<div class="content-block text">
 {{ content.txt }}
 </div>
\ No newline at end of file
diff --git a/apps/course/templates/course/content/video.html b/apps/course/templates/course/content/video.html
index 23f88b8e..df9893f6 100644
--- a/apps/course/templates/course/content/video.html
+++ b/apps/course/templates/course/content/video.html
@@ -1,14 +1,13 @@
-<div>
+<div class="content-block title">
   {{ content.title }}
 </div>
 <div>
-  {% if 'youtu' in content.url %}
+  {% if 'youtube.com' in content.url or 'youtu.be' in content.url %}
   <iframe width="640" height="360" src="https://www.youtube.com/embed/{{ content.video_index }}" frameborder="0" allow="autoplay; encrypted-media"
     allowfullscreen></iframe>
-  {% elif 'vimeo' in content.url %}
+  {% elif 'vimeo.com' in content.url %}
   <iframe src="https://player.vimeo.com/video/{{ content.video_index }}" width="640" height="360" frameborder="0" webkitallowfullscreen
     mozallowfullscreen allowfullscreen>
   </iframe>
-
   {% endif %}
 </div>
\ No newline at end of file