diff --git a/_config.yml b/_config.yml
index 163807f..4364683 100644
--- a/_config.yml
+++ b/_config.yml
@@ -27,6 +27,9 @@ collections:
   repos:
     permalink: "/:name"
     output: true
+  packages:
+    permalink: "/:path"
+    output: true
 
 # -----------------
 #  Build config
diff --git a/_layouts/repo.html b/_layouts/repo.html
index bd050ae..fba1a61 100644
--- a/_layouts/repo.html
+++ b/_layouts/repo.html
@@ -2,9 +2,10 @@
 layout: default
 ---
 
+
 {% assign domain = page.domain | default: site.apt.domain %}
 {% assign repo = page.repo %}
-{% assign list = site.data.index[repo].bionic %}
+{% assign list = site.packages | where: 'Repo', repo %}
 
 <p>
     NOTE: If this is your first time here, you need to do some configurations before you can use this repository.
@@ -18,28 +19,25 @@ layout: default
 {% for component in site.apt.components %}
 
 <h3>{{ component }}</h3>
+{% assign packages = list | where: 'Component', component %}
 
-{% if list[component].size > 0 %}
+{% if packages.size > 0 %}
 
 {% include apt-add.html domain=domain repo=repo components=component %}
 
 <table class="d-lg-table">
     <tr>
         <th style="width: 20%">Name</th>
-        <th>Version</th>
+	<th>Description</th>
+        <th>Latest Version</th>
     </tr>
-    {% for package in list[component] %}
-    {% for version in package.versions %}
+    {% for package in packages %}
     <tr>
-        {% if forloop.first == true %}
-        <td>{{ package.name }}</td>
-        {% else %}
-        <td class="text-center text-gray-light">-</td>
-        {% endif %}
-        <td>{{ version }}</td>
+        <td><a href="{{ package.url | relative_url }}" >{{ package.Name }}</a></td>
+	<td>{{ package.Description }}</td>
+        <td>{{ package.Versions.first[0] }}</td>
     </tr>
     {% endfor %}
-    {% endfor %}
 </table>
 {% else %}
 <p class="text-gray-light">No packages</p>