diff --git a/src/Ombi/ClientApp/.prettierrc.js b/src/Ombi/ClientApp/.prettierrc.js
new file mode 100644
index 000000000..6d817be43
--- /dev/null
+++ b/src/Ombi/ClientApp/.prettierrc.js
@@ -0,0 +1,18 @@
+module.exports = {
+	...require('@exclaimer/prettier-config'),
+	overrides: [
+		{
+			files: ['*.yaml', '*.yml'],
+			options: {
+				tabWidth: 2,
+				singleQuote: false,
+			},
+		},
+		{
+			files: 'index.html',
+			options: {
+				parser: 'html',
+			},
+		},
+	],
+};
diff --git a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
index f62edb822..192507c45 100644
--- a/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
+++ b/src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html
@@ -192,7 +192,13 @@
 						</div>
 
 						<div class="col-12 col-md-10">
+							@defer {
 							<tv-request-grid id="requests-grid" [tvRequest]="tvRequest" [isAdmin]="isAdmin" [tv]="tv"></tv-request-grid>
+							} @placeholder {
+							<div class="loading-spinner">
+								<mat-spinner [color]="'accent'"></mat-spinner>
+							</div>
+							}
 						</div>
 
 						<div class="col-12 col-md-2">
@@ -210,11 +216,17 @@
 										</mat-panel-title>
 									</mat-expansion-panel-header>
 
+									@defer (on viewport) {
 									<tv-requests-panel
 										[tvRequest]="tvRequest"
 										[isAdmin]="isAdmin"
 										[manageOwnRequests]="manageOwnRequests"
 									></tv-requests-panel>
+									} @placeholder {
+									<div class="loading-spinner">
+										<mat-spinner [color]="'accent'"></mat-spinner>
+									</div>
+									}
 								</mat-expansion-panel>
 							</mat-accordion>
 						</div>