diff --git a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
index f105c1205..0014e8bfc 100644
--- a/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
+++ b/resources/assets/js/components/presenter/MixedAlbumPresenter.vue
@@ -28,8 +28,8 @@
 			</b-carousel>
 		</details>
 	</div>
-	<div v-else>
-		<b-carousel :id="status.id + '-carousel'"
+	<div v-else class="w-100 h-100 p-0">
+		<!-- <b-carousel :id="status.id + '-carousel'"
 					style="text-shadow: 1px 1px 2px #333; background-color: #000;"
 					controls
 					img-blank
@@ -49,7 +49,22 @@
 				<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
 
 			</b-carousel-slide>
-		</b-carousel>
+		</b-carousel> -->
+		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
+			<slide v-for="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="max-height: 600px;">
+
+				<video v-if="media.type == 'Video'" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%" :poster="media.preview_url">
+					<source :src="media.url" :type="media.mime">
+				</video>
+
+				<div v-else-if="media.type == 'Image'" :title="media.description">
+					<img :class="media.filter_class + ' img-fluid w-100'" :src="media.url" :alt="media.description" loading="lazy">
+				</div>
+
+				<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+			</slide>
+		</carousel>
 	</div>
 </template>
 
diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
index 173ceb3bb..75fffcd97 100644
--- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
+++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
@@ -1,11 +1,11 @@
 <template>
 	<div v-if="status.sensitive == true">
 		<details class="details-animated">
-			<summary>
+			<summary @click="loadSensitive">
 				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
 				<p class="font-weight-light">(click to show)</p>
 			</summary>
-			<b-carousel :id="status.id + '-carousel'"
+			<!-- <b-carousel :id="status.id + '-carousel'"
 				v-model="cursor"
 				style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;"
 				controls
@@ -20,11 +20,16 @@
 				<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
 					{{cursor + 1}} / {{status.media_attachments.length}}
 				</span>
-			</b-carousel>
+			</b-carousel> -->
+			<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb">
+				<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="max-height: 600px;" :title="img.description">
+					<img :class="img.filter_class + ' img-fluid'" style="max-height: 600px;" :src="img.url" :alt="img.description">
+				</slide>
+			</carousel>
 		</details>
 	</div>
-	<div v-else>
-		<b-carousel :id="status.id + '-carousel'"
+	<div v-else class="w-100 h-100 p-0">
+		<!-- <b-carousel :id="status.id + '-carousel'"
 			v-model="cursor"
 			style="text-shadow: 1px 1px 2px #333;min-height: 330px;display: flex;align-items: center;"
 			controls
@@ -39,7 +44,12 @@
 			<span class="badge badge-dark box-shadow" style="position: absolute;top:10px;right:10px;">
 				{{cursor + 1}} / {{status.media_attachments.length}}
 			</span>
-		</b-carousel>
+		</b-carousel> -->
+		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0">
+			<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;max-height: 600px;" :title="img.description">
+				<img :class="img.filter_class + ' img-fluid w-100 p-0'" style="max-height: 600px;" :src="img.url" :alt="img.description">
+			</slide>
+		</carousel>
 	</div>
 </template>
 
@@ -58,6 +68,42 @@
 			return {
 				cursor: 0
 			}
+		},
+
+		created() {
+			// window.addEventListener("keydown", this.keypressNavigation);
+		},
+
+		beforeDestroy() {
+			// window.removeEventListener("keydown", this.keypressNavigation);
+		},
+
+		methods: {
+			loadSensitive() {
+				this.$refs.carousel.onResize();
+				this.$refs.carousel.goToPage(0);
+			},
+
+			keypressNavigation(e) {
+				let ref = this.$refs.carousel;
+				if (e.keyCode == "37") {
+					e.preventDefault();
+
+					let direction = "backward";
+
+					ref.advancePage(direction);
+					ref.$emit("navigation-click", direction);
+				}
+
+				if (e.keyCode == "39") {
+					e.preventDefault();
+
+					let direction = "forward";
+
+					ref.advancePage(direction);
+					ref.$emit("navigation-click", direction);
+				}
+			}
 		}
 	}
 </script>
\ No newline at end of file