diff --git a/assets/components/tags/tag.vue b/assets/components/tags/tag.vue
index 4cb63a1a..803c4e13 100644
--- a/assets/components/tags/tag.vue
+++ b/assets/components/tags/tag.vue
@@ -15,7 +15,7 @@
                     rel="noopener noreferrer"
                 >
                     <img
-                        :src="`/media/${tag.poster.thumbnail}`"
+                        :src="`/img/${tag.poster.thumbnail}`"
                         class="poster"
                     >
                 </a>
diff --git a/assets/components/tags/tags.vue b/assets/components/tags/tags.vue
index 4064b979..d20e76a6 100644
--- a/assets/components/tags/tags.vue
+++ b/assets/components/tags/tags.vue
@@ -20,16 +20,6 @@
             />
         </div>
 
-        <h3>Finish</h3>
-
-        <div class="tiles">
-            <Tag
-                v-for="tag in tags.finish"
-                :key="`tag-${tag.id}`"
-                :tag="tag"
-            />
-        </div>
-
         <h3>Group</h3>
 
         <div class="tiles">
@@ -39,6 +29,16 @@
                 :tag="tag"
             />
         </div>
+
+        <h3>Finish</h3>
+
+        <div class="tiles">
+            <Tag
+                v-for="tag in tags.finish"
+                :key="`tag-${tag.id}`"
+                :tag="tag"
+            />
+        </div>
     </div>
 </template>
 
diff --git a/assets/components/tile/tag.vue b/assets/components/tile/tag.vue
index 3923ec3c..4b98d903 100644
--- a/assets/components/tile/tag.vue
+++ b/assets/components/tile/tag.vue
@@ -8,7 +8,7 @@
 
         <img
             v-if="tag.poster"
-            :src="`/media/${tag.poster.thumbnail}`"
+            :src="`/img/${tag.poster.thumbnail}`"
             :alt="tag.name"
             class="poster"
         >
diff --git a/public/img/tags/airtight.jpeg b/public/img/tags/airtight.jpeg
new file mode 100755
index 00000000..018cda24
Binary files /dev/null and b/public/img/tags/airtight.jpeg differ
diff --git a/public/img/tags/airtight_thumb.jpeg b/public/img/tags/airtight_thumb.jpeg
new file mode 100755
index 00000000..9e9eac9d
Binary files /dev/null and b/public/img/tags/airtight_thumb.jpeg differ
diff --git a/public/img/tags/anal-creampie.jpeg b/public/img/tags/anal-creampie.jpeg
new file mode 100755
index 00000000..9d878114
Binary files /dev/null and b/public/img/tags/anal-creampie.jpeg differ
diff --git a/public/img/tags/anal-creampie_thumb.jpeg b/public/img/tags/anal-creampie_thumb.jpeg
new file mode 100755
index 00000000..4b17c4a0
Binary files /dev/null and b/public/img/tags/anal-creampie_thumb.jpeg differ
diff --git a/public/img/tags/anal.jpeg b/public/img/tags/anal.jpeg
new file mode 100755
index 00000000..c52ad57f
Binary files /dev/null and b/public/img/tags/anal.jpeg differ
diff --git a/public/img/tags/anal_thumb.jpeg b/public/img/tags/anal_thumb.jpeg
new file mode 100755
index 00000000..e5d10351
Binary files /dev/null and b/public/img/tags/anal_thumb.jpeg differ
diff --git a/public/img/tags/asian.jpeg b/public/img/tags/asian.jpeg
new file mode 100755
index 00000000..dfcb28de
Binary files /dev/null and b/public/img/tags/asian.jpeg differ
diff --git a/public/img/tags/asian_thumb.jpeg b/public/img/tags/asian_thumb.jpeg
new file mode 100755
index 00000000..798a5937
Binary files /dev/null and b/public/img/tags/asian_thumb.jpeg differ
diff --git a/public/img/tags/bdsm.jpeg b/public/img/tags/bdsm.jpeg
new file mode 100755
index 00000000..8d93e1ac
Binary files /dev/null and b/public/img/tags/bdsm.jpeg differ
diff --git a/public/img/tags/bdsm_thumb.jpeg b/public/img/tags/bdsm_thumb.jpeg
new file mode 100755
index 00000000..8aed22a9
Binary files /dev/null and b/public/img/tags/bdsm_thumb.jpeg differ
diff --git a/public/img/tags/blowbang.jpeg b/public/img/tags/blowbang.jpeg
new file mode 100755
index 00000000..2ef072a0
Binary files /dev/null and b/public/img/tags/blowbang.jpeg differ
diff --git a/public/img/tags/blowbang_thumb.jpeg b/public/img/tags/blowbang_thumb.jpeg
new file mode 100755
index 00000000..d5ff2b94
Binary files /dev/null and b/public/img/tags/blowbang_thumb.jpeg differ
diff --git a/public/img/tags/bukkake.jpeg b/public/img/tags/bukkake.jpeg
new file mode 100755
index 00000000..bf7eea8b
Binary files /dev/null and b/public/img/tags/bukkake.jpeg differ
diff --git a/public/img/tags/bukkake_thumb.jpeg b/public/img/tags/bukkake_thumb.jpeg
new file mode 100755
index 00000000..14febd81
Binary files /dev/null and b/public/img/tags/bukkake_thumb.jpeg differ
diff --git a/public/img/tags/caucasian.jpeg b/public/img/tags/caucasian.jpeg
new file mode 100755
index 00000000..c3d3fb26
Binary files /dev/null and b/public/img/tags/caucasian.jpeg differ
diff --git a/public/img/tags/caucasian_thumb.jpeg b/public/img/tags/caucasian_thumb.jpeg
new file mode 100755
index 00000000..3fd41ff3
Binary files /dev/null and b/public/img/tags/caucasian_thumb.jpeg differ
diff --git a/public/img/tags/creampie.jpeg b/public/img/tags/creampie.jpeg
new file mode 100755
index 00000000..6da563b3
Binary files /dev/null and b/public/img/tags/creampie.jpeg differ
diff --git a/public/img/tags/creampie_thumb.jpeg b/public/img/tags/creampie_thumb.jpeg
new file mode 100755
index 00000000..0f927374
Binary files /dev/null and b/public/img/tags/creampie_thumb.jpeg differ
diff --git a/public/img/tags/da-tp.jpeg b/public/img/tags/da-tp.jpeg
new file mode 100755
index 00000000..c9187c94
Binary files /dev/null and b/public/img/tags/da-tp.jpeg differ
diff --git a/public/img/tags/da-tp_thumb.jpeg b/public/img/tags/da-tp_thumb.jpeg
new file mode 100755
index 00000000..bfcc0d12
Binary files /dev/null and b/public/img/tags/da-tp_thumb.jpeg differ
diff --git a/public/img/tags/double-anal.jpeg b/public/img/tags/double-anal.jpeg
new file mode 100755
index 00000000..844345e5
Binary files /dev/null and b/public/img/tags/double-anal.jpeg differ
diff --git a/public/img/tags/double-anal_thumb.jpeg b/public/img/tags/double-anal_thumb.jpeg
new file mode 100755
index 00000000..fe2af0fd
Binary files /dev/null and b/public/img/tags/double-anal_thumb.jpeg differ
diff --git a/public/img/tags/double-penetration.jpeg b/public/img/tags/double-penetration.jpeg
new file mode 100755
index 00000000..3b21b8cc
Binary files /dev/null and b/public/img/tags/double-penetration.jpeg differ
diff --git a/public/img/tags/double-penetration_thumb.jpeg b/public/img/tags/double-penetration_thumb.jpeg
new file mode 100755
index 00000000..105bdaa7
Binary files /dev/null and b/public/img/tags/double-penetration_thumb.jpeg differ
diff --git a/public/img/tags/double-vaginal.jpeg b/public/img/tags/double-vaginal.jpeg
new file mode 100755
index 00000000..9db18067
Binary files /dev/null and b/public/img/tags/double-vaginal.jpeg differ
diff --git a/public/img/tags/double-vaginal_thumb.jpeg b/public/img/tags/double-vaginal_thumb.jpeg
new file mode 100755
index 00000000..7c4d4bf9
Binary files /dev/null and b/public/img/tags/double-vaginal_thumb.jpeg differ
diff --git a/public/img/tags/dv-tp.jpeg b/public/img/tags/dv-tp.jpeg
new file mode 100755
index 00000000..7b9daddb
Binary files /dev/null and b/public/img/tags/dv-tp.jpeg differ
diff --git a/public/img/tags/dv-tp_thumb.jpeg b/public/img/tags/dv-tp_thumb.jpeg
new file mode 100755
index 00000000..7826f75e
Binary files /dev/null and b/public/img/tags/dv-tp_thumb.jpeg differ
diff --git a/public/img/tags/ebony.jpeg b/public/img/tags/ebony.jpeg
new file mode 100755
index 00000000..0b5f6856
Binary files /dev/null and b/public/img/tags/ebony.jpeg differ
diff --git a/public/img/tags/ebony_thumb.jpeg b/public/img/tags/ebony_thumb.jpeg
new file mode 100755
index 00000000..48593420
Binary files /dev/null and b/public/img/tags/ebony_thumb.jpeg differ
diff --git a/public/img/tags/facial.jpeg b/public/img/tags/facial.jpeg
new file mode 100755
index 00000000..c87f9a84
Binary files /dev/null and b/public/img/tags/facial.jpeg differ
diff --git a/public/img/tags/facial_thumb.jpeg b/public/img/tags/facial_thumb.jpeg
new file mode 100755
index 00000000..628c2e44
Binary files /dev/null and b/public/img/tags/facial_thumb.jpeg differ
diff --git a/public/img/tags/gangbang.jpeg b/public/img/tags/gangbang.jpeg
new file mode 100755
index 00000000..fd4e991d
Binary files /dev/null and b/public/img/tags/gangbang.jpeg differ
diff --git a/public/img/tags/gangbang_thumb.jpeg b/public/img/tags/gangbang_thumb.jpeg
new file mode 100755
index 00000000..5a30c89c
Binary files /dev/null and b/public/img/tags/gangbang_thumb.jpeg differ
diff --git a/public/img/tags/interracial.jpeg b/public/img/tags/interracial.jpeg
new file mode 100755
index 00000000..941add94
Binary files /dev/null and b/public/img/tags/interracial.jpeg differ
diff --git a/public/img/tags/interracial_thumb.jpeg b/public/img/tags/interracial_thumb.jpeg
new file mode 100755
index 00000000..5c216f91
Binary files /dev/null and b/public/img/tags/interracial_thumb.jpeg differ
diff --git a/public/img/tags/latina.jpeg b/public/img/tags/latina.jpeg
new file mode 100755
index 00000000..6251f85f
Binary files /dev/null and b/public/img/tags/latina.jpeg differ
diff --git a/public/img/tags/latina_thumb.jpeg b/public/img/tags/latina_thumb.jpeg
new file mode 100755
index 00000000..53828a06
Binary files /dev/null and b/public/img/tags/latina_thumb.jpeg differ
diff --git a/public/img/tags/lesbian.jpeg b/public/img/tags/lesbian.jpeg
new file mode 100755
index 00000000..3c8aa333
Binary files /dev/null and b/public/img/tags/lesbian.jpeg differ
diff --git a/public/img/tags/lesbian_thumb.jpeg b/public/img/tags/lesbian_thumb.jpeg
new file mode 100755
index 00000000..29ad7005
Binary files /dev/null and b/public/img/tags/lesbian_thumb.jpeg differ
diff --git a/public/img/tags/mff.jpeg b/public/img/tags/mff.jpeg
new file mode 100755
index 00000000..05baf42b
Binary files /dev/null and b/public/img/tags/mff.jpeg differ
diff --git a/public/img/tags/mff_thumb.jpeg b/public/img/tags/mff_thumb.jpeg
new file mode 100755
index 00000000..c2b06d98
Binary files /dev/null and b/public/img/tags/mff_thumb.jpeg differ
diff --git a/public/img/tags/mfm.jpeg b/public/img/tags/mfm.jpeg
new file mode 100755
index 00000000..e5fa5557
Binary files /dev/null and b/public/img/tags/mfm.jpeg differ
diff --git a/public/img/tags/mfm_thumb.jpeg b/public/img/tags/mfm_thumb.jpeg
new file mode 100755
index 00000000..19e28253
Binary files /dev/null and b/public/img/tags/mfm_thumb.jpeg differ
diff --git a/public/img/tags/oral-creampie.jpeg b/public/img/tags/oral-creampie.jpeg
new file mode 100755
index 00000000..3fc509ad
Binary files /dev/null and b/public/img/tags/oral-creampie.jpeg differ
diff --git a/public/img/tags/oral-creampie_thumb.jpeg b/public/img/tags/oral-creampie_thumb.jpeg
new file mode 100755
index 00000000..21b0fd6c
Binary files /dev/null and b/public/img/tags/oral-creampie_thumb.jpeg differ
diff --git a/public/img/tags/orgy.jpeg b/public/img/tags/orgy.jpeg
new file mode 100755
index 00000000..ed009de7
Binary files /dev/null and b/public/img/tags/orgy.jpeg differ
diff --git a/public/img/tags/orgy_thumb.jpeg b/public/img/tags/orgy_thumb.jpeg
new file mode 100755
index 00000000..32828380
Binary files /dev/null and b/public/img/tags/orgy_thumb.jpeg differ
diff --git a/public/img/tags/swallowing.jpeg b/public/img/tags/swallowing.jpeg
new file mode 100755
index 00000000..50a54af3
Binary files /dev/null and b/public/img/tags/swallowing.jpeg differ
diff --git a/public/img/tags/swallowing_thumb.jpeg b/public/img/tags/swallowing_thumb.jpeg
new file mode 100755
index 00000000..f15302c9
Binary files /dev/null and b/public/img/tags/swallowing_thumb.jpeg differ
diff --git a/public/img/tags/triple-anal.jpeg b/public/img/tags/triple-anal.jpeg
new file mode 100755
index 00000000..c793dabb
Binary files /dev/null and b/public/img/tags/triple-anal.jpeg differ
diff --git a/public/img/tags/triple-anal_thumb.jpeg b/public/img/tags/triple-anal_thumb.jpeg
new file mode 100755
index 00000000..26eef779
Binary files /dev/null and b/public/img/tags/triple-anal_thumb.jpeg differ
diff --git a/seeds/04_media.js b/seeds/04_media.js
index c8e43de0..09d8ea0f 100644
--- a/seeds/04_media.js
+++ b/seeds/04_media.js
@@ -3,7 +3,7 @@ const upsert = require('../src/utils/upsert');
 function getMedia(tagsMap) {
     return [
         {
-            path: 'tags/airtight/poster.jpeg',
+            path: 'tags/airtight.jpeg',
             target_id: tagsMap.airtight,
             role: 'poster',
             comment: 'Jynx Maze in "Pump My Ass Full of Cum 3" for Jules Jordan',
@@ -25,31 +25,31 @@ function getMedia(tagsMap) {
             comment: 'Sheena Shaw in "Ass Worship 14" for Jules Jordan',
         },
         {
-            path: 'tags/anal/poster.jpeg',
+            path: 'tags/anal.jpeg',
             target_id: tagsMap.anal,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-penetration/poster.jpeg',
+            path: 'tags/double-penetration.jpeg',
             target_id: tagsMap['double-penetration'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-anal/poster.jpeg',
+            path: 'tags/double-anal.jpeg',
             target_id: tagsMap['double-anal'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-vaginal/poster.jpeg',
+            path: 'tags/double-vaginal.jpeg',
             target_id: tagsMap['double-vaginal'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/da-tp/poster.jpeg',
+            path: 'tags/da-tp.jpeg',
             target_id: tagsMap['da-tp'],
             role: 'poster',
             comment: 'Ninel Mojado aka Mira Cuckold in GIO063 for LegalPorno',
@@ -67,13 +67,13 @@ function getMedia(tagsMap) {
             comment: 'Angel Smalls in GIO408 for LegalPorno',
         },
         {
-            path: 'tags/dv-tp/poster.jpeg',
+            path: 'tags/dv-tp.jpeg',
             target_id: tagsMap['dv-tp'],
             role: 'poster',
             comment: 'Juelz Ventura in "Gangbanged 5" for Elegant Angel',
         },
         {
-            path: 'tags/triple-anal/poster.jpeg',
+            path: 'tags/triple-anal.jpeg',
             target_id: tagsMap['triple-anal'],
             role: 'poster',
             comment: 'Kristy Black in SZ1986 for LegalPorno',
@@ -91,13 +91,13 @@ function getMedia(tagsMap) {
             comment: 'Kira Thorn in GIO1018 for LegalPorno',
         },
         {
-            path: 'tags/blowbang/poster.jpeg',
+            path: 'tags/blowbang.jpeg',
             target_id: tagsMap.blowbang,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/gangbang/poster.jpeg',
+            path: 'tags/gangbang.jpeg',
             target_id: tagsMap.gangbang,
             role: 'poster',
             comment: '',
@@ -109,85 +109,97 @@ function getMedia(tagsMap) {
             comment: 'Ginger Lynn in "Gangbang Mystique", a photoset shot by Suze Randall for Puritan No. 10, 1984. This photo pushed the boundaries of pornography at the time, as depicting a woman \'fully occupied\' was unheard of.',
         },
         {
-            path: 'tags/mff/poster.jpeg',
+            path: 'tags/gangbang/2.jpeg',
+            target_id: tagsMap.gangbang,
+            role: 'photo',
+            comment: 'Riley Reid\'s double anal in "The Gangbang of Riley Reid" for Jules Jordan',
+        },
+        {
+            path: 'tags/gangbang/3.jpeg',
+            target_id: tagsMap.gangbang,
+            role: 'photo',
+            comment: 'Kelsi Monroe in "Brazzers House 2, Day 2" for Brazzers',
+        },
+        {
+            path: 'tags/mff.jpeg',
             target_id: tagsMap.mff,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/mfm/poster.jpeg',
+            path: 'tags/mfm.jpeg',
             target_id: tagsMap.mfm,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/orgy/poster.jpeg',
+            path: 'tags/orgy.jpeg',
             target_id: tagsMap.orgy,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/asian/poster.jpeg',
+            path: 'tags/asian.jpeg',
             target_id: tagsMap.asian,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/caucasian/poster.jpeg',
+            path: 'tags/caucasian.jpeg',
             target_id: tagsMap.caucasian,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/ebony/poster.jpeg',
+            path: 'tags/ebony.jpeg',
             target_id: tagsMap.ebony,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/latina/poster.jpeg',
+            path: 'tags/latina.jpeg',
             target_id: tagsMap.latina,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/interracial/poster.jpeg',
+            path: 'tags/interracial.jpeg',
             target_id: tagsMap.interracial,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/facial/poster.jpeg',
+            path: 'tags/facial.jpeg',
             target_id: tagsMap.facial,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/bukkake/poster.jpeg',
+            path: 'tags/bukkake.jpeg',
             target_id: tagsMap.bukkake,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/swallowing/poster.jpeg',
+            path: 'tags/swallowing.jpeg',
             target_id: tagsMap.swallowing,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/creampie/poster.jpeg',
+            path: 'tags/creampie.jpeg',
             target_id: tagsMap.creampie,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/anal-creampie/poster.jpeg',
+            path: 'tags/anal-creampie.jpeg',
             target_id: tagsMap['anal-creampie'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/oral-creampie/poster.jpeg',
+            path: 'tags/oral-creampie.jpeg',
             target_id: tagsMap['oral-creampie'],
             role: 'poster',
             comment: '',