diff --git a/src/library/title.cr b/src/library/title.cr
index 883f36c..d1520be 100644
--- a/src/library/title.cr
+++ b/src/library/title.cr
@@ -252,6 +252,10 @@ class Title
     @title_ids.map { |tid| Library.default.get_title! tid }
   end
 
+  def sorted_titles(username, opt : SortOptions? = nil)
+    titles 
+  end
+
   # Get all entries, including entries in nested titles
   def deep_entries
     return @entries if title_ids.empty?
diff --git a/src/routes/main.cr b/src/routes/main.cr
index 4aa7da6..87a7c3b 100644
--- a/src/routes/main.cr
+++ b/src/routes/main.cr
@@ -61,9 +61,15 @@ struct MainRouter
         sort_opt = SortOptions.from_info_json title.dir, username
         get_and_save_sort_opt title.dir
 
+        sorted_titles = title.sorted_titles username, sort_opt
         entries = title.sorted_entries username, sort_opt
         percentage = title.load_percentage_for_all_entries username, sort_opt
         title_percentage = title.titles.map &.load_percentage username
+        title_percentage_map = {} of String => Float64
+        title_percentage.each_with_index do |percentage, i|
+          t = title.titles[i]
+          title_percentage_map[t.id] = percentage
+        end
 
         layout "title"
       rescue e
diff --git a/src/views/title.html.ecr b/src/views/title.html.ecr
index 99b9380..6880347 100644
--- a/src/views/title.html.ecr
+++ b/src/views/title.html.ecr
@@ -60,8 +60,8 @@
 </div>
 
 <div class="uk-child-width-1-4@m uk-child-width-1-2" uk-grid>
-  <% title.titles.each_with_index do |item, i| %>
-    <% progress = title_percentage[i] %>
+  <% sorted_titles.each do |item| %>
+    <% progress = title_percentage_map[item.id] %>
     <%= render_component "card" %>
   <% end %>
 </div>