diff --git a/_layouts/repo.html b/_layouts/repo.html
index fba1a61..2a782b7 100644
--- a/_layouts/repo.html
+++ b/_layouts/repo.html
@@ -2,45 +2,16 @@
 layout: default
 ---
 
+{% assign id = page.slug %}
+{% assign dists = site.packages | where: 'Repo', id | group_by: 'Archive' %}
 
-{% assign domain = page.domain | default: site.apt.domain %}
-{% assign repo = page.repo %}
-{% assign list = site.packages | where: 'Repo', repo %}
+<h2>{{ page.title }} repository</h2>
 
-<p>
-    NOTE: If this is your first time here, you need to do some configurations before you can use this repository.
-    Please read the <a target="_blank" href="{{ "/#setup" | absolute_url }}">instructions</a>.
-</p>
-
-<h2>{{ page.title }} Repository</h2>
-
-<p>{{ page.description }}</p>
-
-{% for component in site.apt.components %}
-
-<h3>{{ component }}</h3>
-{% assign packages = list | where: 'Component', component %}
-
-{% 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>Description</th>
-        <th>Latest Version</th>
-    </tr>
-    {% for package in packages %}
-    <tr>
-        <td><a href="{{ package.url | relative_url }}" >{{ package.Name }}</a></td>
-	<td>{{ package.Description }}</td>
-        <td>{{ package.Versions.first[0] }}</td>
-    </tr>
-    {% endfor %}
-</table>
-{% else %}
-<p class="text-gray-light">No packages</p>
-{% endif %}
+<p>Choose your ubuntu version below</p>
 
+<ul>
+{% for dist in dists %}
+	{% assign info = site.data.dists[dist.name] %}
+	<li><a href="{{ page.url | replative_url }}/{{ dist.name }}">{{ dist.name }} {{ info.version }}</a> - {{ dist.items.size }} Packages</li>
 {% endfor %}
+</ul>