diff --git a/Shared/Views/LiveTVChannelItemElement.swift b/Shared/Views/LiveTVChannelItemElement.swift
index f36aa1bf..939a0152 100644
--- a/Shared/Views/LiveTVChannelItemElement.swift
+++ b/Shared/Views/LiveTVChannelItemElement.swift
@@ -120,7 +120,7 @@ struct LiveTVChannelItemElement: View {
 			.stroke(isFocused ? Color.blue : Color.clear, lineWidth: 4))
 		.cornerRadius(20)
 		.scaleEffect(isFocused ? 1.1 : 1)
-		.focusable(true)
+//		.focusable(true)
 		.focused($focused)
 		.onChange(of: focused) { foc in
 			withAnimation(.linear(duration: 0.15)) {
diff --git a/Swiftfin tvOS/Views/LibraryListView.swift b/Swiftfin tvOS/Views/LibraryListView.swift
index 9001544d..4760e74e 100644
--- a/Swiftfin tvOS/Views/LibraryListView.swift	
+++ b/Swiftfin tvOS/Views/LibraryListView.swift	
@@ -38,31 +38,6 @@ struct LibraryListView: View {
 									self.mainCoordinator.root(\.liveTV)
 								}
 									label: {
-										ZStack {
-											HStack {
-												Spacer()
-												VStack {
-													Text(library.name ?? "")
-														.foregroundColor(.white)
-														.font(.title2)
-														.fontWeight(.semibold)
-												}
-												Spacer()
-											}.padding(32)
-										}
-										.frame(minWidth: 100, maxWidth: .infinity)
-										.frame(height: 100)
-									}
-										.cornerRadius(10)
-										.shadow(radius: 5)
-										.padding(.bottom, 5)
-							}
-						} else {
-							Button {
-								self.libraryListRouter.route(to: \.library,
-								                             (viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
-							}
-								label: {
 									ZStack {
 										HStack {
 											Spacer()
@@ -81,6 +56,31 @@ struct LibraryListView: View {
 									.cornerRadius(10)
 									.shadow(radius: 5)
 									.padding(.bottom, 5)
+							}
+						} else {
+							Button {
+								self.libraryListRouter.route(to: \.library,
+								                             (viewModel: LibraryViewModel(parentID: library.id), title: library.name ?? ""))
+							}
+								label: {
+								ZStack {
+									HStack {
+										Spacer()
+										VStack {
+											Text(library.name ?? "")
+												.foregroundColor(.white)
+												.font(.title2)
+												.fontWeight(.semibold)
+										}
+										Spacer()
+									}.padding(32)
+								}
+								.frame(minWidth: 100, maxWidth: .infinity)
+								.frame(height: 100)
+							}
+								.cornerRadius(10)
+								.shadow(radius: 5)
+								.padding(.bottom, 5)
 						}
 					}
 				} else {
diff --git a/Swiftfin/Components/EpisodesRowView/EpisodesRowView.swift b/Swiftfin/Components/EpisodesRowView/EpisodesRowView.swift
index 3bcac987..6f6831a8 100644
--- a/Swiftfin/Components/EpisodesRowView/EpisodesRowView.swift
+++ b/Swiftfin/Components/EpisodesRowView/EpisodesRowView.swift
@@ -29,7 +29,8 @@ struct EpisodesRowView<RowManager>: View where RowManager: EpisodesRowManager {
 					}
 				} else {
 					Menu {
-						ForEach(Array(viewModel.seasonsEpisodes.keys).sorted(by: { $0.name ?? "" < $1.name ?? "" }), id: \.self) { season in
+						ForEach(Array(viewModel.seasonsEpisodes.keys).sorted(by: { $0.indexNumber ?? 0 < $1.indexNumber ?? 0 }),
+						        id: \.self) { season in
 							Button {
 								viewModel.select(season: season)
 							} label: {