diff --git a/_data/dists.yml b/_data/dists.yml
new file mode 100644
index 0000000..6adf310
--- /dev/null
+++ b/_data/dists.yml
@@ -0,0 +1,6 @@
+
+bionic:
+    version: 18.04
+
+eoan:
+    version: 19.10
diff --git a/_includes/apt-add.html b/_includes/apt-add.html
index b1b4634..554fdb4 100644
--- a/_includes/apt-add.html
+++ b/_includes/apt-add.html
@@ -1,5 +1,6 @@
 {% assign domain = include.domain | default: site.apt.domain %}
+{% assign dist = include.distribution | default: "bionic" %}
 {% highlight bash %}
-$ sudo apt-add-repository -y 'deb [arch=amd64] https://{{ domain }}/{{ include.repo }} bionic {{ include.components }}' {% if include.update == true %}
+$ sudo apt-add-repository -y 'deb [arch=amd64] https://{{ domain }}/{{ include.repo }} {{ dist }} {{ include.components }}' {% if include.update == true %}
 $ sudo apt-get update{% endif %}
 {% endhighlight %}
diff --git a/_layouts/dist.html b/_layouts/dist.html
new file mode 100644
index 0000000..61206cc
--- /dev/null
+++ b/_layouts/dist.html
@@ -0,0 +1,48 @@
+---
+layout: default
+---
+
+{% assign dist = page.slug %}
+{% assign repo = page.url | remove_first: '/' | split: '/' | first %}
+{% assign repo_info = site.repos | where: 'repo', repo | first %}
+
+{% assign domain = repo_info.domain | default: site.apt.domain %}
+{% assign list = site.packages | where: 'Repo', repo | where: 'Archive', dist %}
+
+<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>{{ repo }} - {{ dist }}</h2>
+
+<p>{{ repo_info.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 distribution=dist 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 %}
+
+{% endfor %}
diff --git a/_layouts/package.html b/_layouts/package.html
index 224529e..4e978d1 100644
--- a/_layouts/package.html
+++ b/_layouts/package.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<h2>Package: {{ page.Name }} ({{ page.Versions.first[0] }}) [{{ page.Component }}]</h2>
+<h2>Package: {{ page.Name }} ({{ page.Versions.first[0] }}) [{{ page.Archive }}:{{ page.Component }}]</h2>
 
 <h3>{{ page.Description | capitalize }}</h3>
 
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>
diff --git a/_packages/bos/bionic.md b/_packages/bos/bionic.md
new file mode 100644
index 0000000..fd5dc62
--- /dev/null
+++ b/_packages/bos/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "bos/bionic"
+---
diff --git a/_packages/daobet/bionic.md b/_packages/daobet/bionic.md
new file mode 100644
index 0000000..35dc5ba
--- /dev/null
+++ b/_packages/daobet/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "daobet/bionic"
+---
diff --git a/_packages/eosio/bionic.md b/_packages/eosio/bionic.md
new file mode 100644
index 0000000..7e1daa2
--- /dev/null
+++ b/_packages/eosio/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "eosio/eoan"
+---
diff --git a/_packages/main/bionic.md b/_packages/main/bionic.md
new file mode 100644
index 0000000..bb8d1c1
--- /dev/null
+++ b/_packages/main/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "main/bionic"
+---
diff --git a/_packages/uos/bionic.md b/_packages/uos/bionic.md
new file mode 100644
index 0000000..c42a69c
--- /dev/null
+++ b/_packages/uos/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "uos/bionic"
+---
diff --git a/_packages/wax/bionic.md b/_packages/wax/bionic.md
new file mode 100644
index 0000000..fa6a51c
--- /dev/null
+++ b/_packages/wax/bionic.md
@@ -0,0 +1,4 @@
+---
+layout: dist
+title: "wax/bionic"
+---