diff --git a/JellyfinPlayer/ContinueWatchingView.swift b/JellyfinPlayer/ContinueWatchingView.swift
index cb565758..0728f566 100644
--- a/JellyfinPlayer/ContinueWatchingView.swift
+++ b/JellyfinPlayer/ContinueWatchingView.swift
@@ -109,7 +109,7 @@ struct ContinueWatchingView: View {
         if(resumeItems.count != 0) {
             VStack(alignment: .leading) {
                 ScrollView(.horizontal, showsIndicators: false) {
-                    HStack() {
+                    LazyHStack() {
                         if(isLoading == false) {
                             Spacer().frame(width:16)
                             ForEach(resumeItems, id: \.Id) { item in
diff --git a/JellyfinPlayer/LatestMediaView.swift b/JellyfinPlayer/LatestMediaView.swift
index 9d572176..44f91a87 100644
--- a/JellyfinPlayer/LatestMediaView.swift
+++ b/JellyfinPlayer/LatestMediaView.swift
@@ -84,7 +84,7 @@ struct LatestMediaView: View {
     
     var body: some View {
             ScrollView(.horizontal, showsIndicators: false) {
-                HStack() {
+                LazyHStack() {
                     Spacer().frame(width:18)
                     ForEach(resumeItems, id: \.Id) { item in
                         NavigationLink(destination: ItemView(item: item)) {
diff --git a/JellyfinPlayer/LibraryView.swift b/JellyfinPlayer/LibraryView.swift
index 570b9ad5..77aae1bf 100644
--- a/JellyfinPlayer/LibraryView.swift
+++ b/JellyfinPlayer/LibraryView.swift
@@ -33,8 +33,6 @@ struct LibraryView: View {
     @State private var url: String = "";
     @State private var closeSearch: Bool = false;
     
-    var gridItems: [GridItem] = [GridItem(.adaptive(minimum: 150, maximum: 400))]
-    
     init(prefill: String?, names: [String: String], libraries: [String]) {
         _prefill_id = State(wrappedValue: prefill ?? "")
         _library_names = State(wrappedValue: names)
@@ -166,91 +164,93 @@ struct LibraryView: View {
         _tracks.wrappedValue = []
         for _ in (0..<trkCnt)
         {
-            _tracks.wrappedValue.append(GridTrack.fr(1))
+            _tracks.wrappedValue.append(GridItem.init(.flexible()))
         }
     }
     
-    @State private var tracks: [GridTrack] = []
+    @State private var tracks: [GridItem] = []
     
     var body: some View {
         if(prefill_id != "") {
             LoadingView(isShowing: $isLoading) {
                 GeometryReader { geometry in
-                    Grid(tracks: _tracks.wrappedValue, spacing: GridSpacing(horizontal: 0, vertical: 20)) {
-                        ForEach(items, id: \.Id) { item in
-                            NavigationLink(destination: ItemView(item: item )) {
-                                VStack(alignment: .leading) {
-                                    if(item.Type == "Movie") {
-                                        WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=150&quality=90&tag=\(item.Image)"))
-                                            .resizable()
-                                            .placeholder {
-                                                Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ?  "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 32, height: 32))!)
-                                                    .resizable()
-                                                    .frame(width: 100, height: 150)
-                                                    .cornerRadius(10)
-                                            }
-                                            .frame(width:100, height: 150)
-                                            .cornerRadius(10)
-                                            .shadow(radius: 5)
-                                    } else {
-                                        WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=150&quality=90&tag=\(item.Image)"))
-                                            .resizable()
-                                            .placeholder {
-                                                Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ?  "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 32, height: 32))!)
-                                                    .resizable()
-                                                    .frame(width: 100, height: 150)
-                                                    .cornerRadius(10)
-                                            }
-                                            .frame(width:100, height: 150)
-                                            .cornerRadius(10).overlay(
-                                                ZStack {
-                                                    if(item.ItemBadge == 0) {
-                                                        Image(systemName: "checkmark")
-                                                            .font(.caption)
-                                                            .padding(3)
-                                                            .foregroundColor(.white)
-                                                    } else {
-                                                        Text("\(String(item.ItemBadge ?? 0))")
-                                                            .font(.caption)
-                                                            .padding(3)
-                                                            .foregroundColor(.white)
-                                                    }
-                                                }.background(Color.black)
-                                                .opacity(0.8)
-                                                .cornerRadius(10.0)
-                                                .padding(3), alignment: .topTrailing
-                                            )
-                                            .shadow(radius: 5)
-                                    }
-                                    Text(item.Name)
-                                        .font(.caption)
-                                        .fontWeight(.semibold)
-                                        .foregroundColor(.primary)
-                                        .lineLimit(1)
-                                    Text(String(item.ProductionYear))
-                                        .foregroundColor(.secondary)
-                                        .font(.caption)
-                                        .fontWeight(.medium)
-                                }.frame(width: 100)
-                            }
-                        }
-                        if(startIndex + endIndex < totalItems) {
-                            HStack() {
-                                Spacer()
-                                Button() {
-                                    startIndex += endIndex;
-                                    loadItems()
-                                } label: {
-                                    HStack() {
-                                        Text("Load more").font(.callout)
-                                        Image(systemName: "arrow.clockwise")
-                                    }
+                    ScrollView(.vertical) {
+                        LazyVGrid(columns: tracks) {
+                            ForEach(items, id: \.Id) { item in
+                                NavigationLink(destination: ItemView(item: item )) {
+                                    VStack(alignment: .leading) {
+                                        if(item.Type == "Movie") {
+                                            WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=150&quality=90&tag=\(item.Image)"))
+                                                .resizable()
+                                                .placeholder {
+                                                    Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ?  "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 6, height: 6))!)
+                                                        .resizable()
+                                                        .frame(width: 100, height: 150)
+                                                        .cornerRadius(10)
+                                                }
+                                                .frame(width:100, height: 150)
+                                                .cornerRadius(10)
+                                                .shadow(radius: 5)
+                                        } else {
+                                            WebImage(url: URL(string: "\(globalData.server?.baseURI ?? "")/Items/\(item.Id)/Images/\(item.ImageType)?maxWidth=150&quality=90&tag=\(item.Image)"))
+                                                .resizable()
+                                                .placeholder {
+                                                    Image(uiImage: UIImage(blurHash: (item.BlurHash == "" ?  "W$H.4}D%bdo#a#xbtpxVW?W?jXWsXVt7Rjf5axWqxbWXnhada{s-" : item.BlurHash), size: CGSize(width: 6, height: 6))!)
+                                                        .resizable()
+                                                        .frame(width: 100, height: 150)
+                                                        .cornerRadius(10)
+                                                }
+                                                .frame(width:100, height: 150)
+                                                .cornerRadius(10).overlay(
+                                                    ZStack {
+                                                        if(item.ItemBadge == 0) {
+                                                            Image(systemName: "checkmark")
+                                                                .font(.caption)
+                                                                .padding(3)
+                                                                .foregroundColor(.white)
+                                                        } else {
+                                                            Text("\(String(item.ItemBadge ?? 0))")
+                                                                .font(.caption)
+                                                                .padding(3)
+                                                                .foregroundColor(.white)
+                                                        }
+                                                    }.background(Color.black)
+                                                    .opacity(0.8)
+                                                    .cornerRadius(10.0)
+                                                    .padding(3), alignment: .topTrailing
+                                                )
+                                                .shadow(radius: 5)
+                                        }
+                                        Text(item.Name)
+                                            .font(.caption)
+                                            .fontWeight(.semibold)
+                                            .foregroundColor(.primary)
+                                            .lineLimit(1)
+                                        Text(String(item.ProductionYear))
+                                            .foregroundColor(.secondary)
+                                            .font(.caption)
+                                            .fontWeight(.medium)
+                                    }.frame(width: 100)
                                 }
-                                Spacer()
-                            }.gridSpan(column: _tracks.wrappedValue.count)
+                            }
+                            if(startIndex + endIndex < totalItems) {
+                                HStack() {
+                                    Spacer()
+                                    Button() {
+                                        startIndex += endIndex;
+                                        loadItems()
+                                    } label: {
+                                        HStack() {
+                                            Text("Load more").font(.callout)
+                                            Image(systemName: "arrow.clockwise")
+                                        }
+                                    }
+                                    Spacer()
+                                }
+                            }
+                            Spacer().frame(height: 2)
                         }
-                        Spacer().frame(height: 2).gridSpan(column: _tracks.wrappedValue.count)
-                    }.gridContentMode(.scroll)
+                    }
                     .onChange(of: isPortrait) { _ in
                         recalcTracks()
                     }
diff --git a/JellyfinPlayer/NextUpView.swift b/JellyfinPlayer/NextUpView.swift
index 1b4c5a07..7d85ac43 100644
--- a/JellyfinPlayer/NextUpView.swift
+++ b/JellyfinPlayer/NextUpView.swift
@@ -72,7 +72,7 @@ struct NextUpView: View {
             if(resumeItems.count != 0) {
                 Text("Next Up").font(.title2).fontWeight(.bold).padding(EdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 16))
                 ScrollView(.horizontal, showsIndicators: false) {
-                    HStack() {
+                    LazyHStack() {
                         if(isLoading == false) {
                             Spacer().frame(width:18)
                             ForEach(resumeItems, id: \.Id) { item in
@@ -108,8 +108,8 @@ struct NextUpView: View {
                             }
                             Spacer().frame(width:18)
                         }
-                    }
-                }.padding(EdgeInsets(top: -2, leading: 0, bottom: 0, trailing: 0))
+                    }.frame(height: 200)
+                }.padding(EdgeInsets(top: -2, leading: 0, bottom: 0, trailing: 0)).frame(height: 200)
             }
         }.onAppear(perform: onAppear).padding(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
     }