diff --git a/app/components/icons/folder-multiple-outline.js b/app/components/icons/folder-multiple-outline.js
new file mode 100644
index 0000000..cbba2f2
--- /dev/null
+++ b/app/components/icons/folder-multiple-outline.js
@@ -0,0 +1 @@
+export { FolderMultipleOutline as default } from 'ember-mdi';
diff --git a/app/routes/admin.js b/app/routes/admin.js
index 9292977..a246cb4 100644
--- a/app/routes/admin.js
+++ b/app/routes/admin.js
@@ -2,14 +2,14 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 
 export default class AdminRoute extends Route {
-  @service meilisearch;
+  // @service meilisearch;
   @service session;
 
   beforeModel(transition) {
     this.session.requireAuthentication(transition, 'login');
   }
 
-  async model() {
-    return this.meilisearch.getIndexes();
-  }
+  // async model() {
+  //   return this.meilisearch.getIndexes();
+  // }
 }
diff --git a/app/routes/admin/index.js b/app/routes/admin/index.js
index 5928227..9393cad 100644
--- a/app/routes/admin/index.js
+++ b/app/routes/admin/index.js
@@ -7,10 +7,8 @@ export default class AdminIndexRoute extends Route {
   @service session;
 
   async model() {
-    const indexes = this.modelFor('admin');
-
     return hash({
-      indexes,
+      indexes: this.meilisearch.getIndexes(),
       health: this.meilisearch.getHealth(),
       version: this.meilisearch.getVersion(),
       stats: this.meilisearch.getStats(),
diff --git a/app/routes/admin/indexes/item.js b/app/routes/admin/indexes/item.js
index 1fc3228..b0802be 100644
--- a/app/routes/admin/indexes/item.js
+++ b/app/routes/admin/indexes/item.js
@@ -1,7 +1,10 @@
 import Route from '@ember/routing/route';
+import { inject as service } from '@ember/service';
 
 export default class AdminIndexesItemRoute extends Route {
+  @service meilisearch;
+
   model({ uid }) {
-    return this.modelFor('admin').find((item) => item.uid === uid);
+    return this.meilisearch.getIndex(uid);
   }
 }
diff --git a/app/services/meilisearch.js b/app/services/meilisearch.js
index 9491141..9b9a341 100644
--- a/app/services/meilisearch.js
+++ b/app/services/meilisearch.js
@@ -10,6 +10,10 @@ export default class MeilisearchService extends Service {
     });
   }
 
+  getIndex(uid) {
+    return query(`indexes/${uid}`).then((item) => new Index(item));
+  }
+
   getHealth() {
     return query('health');
   }
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index c8ff49c..4475e9e 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -12,7 +12,7 @@
         as |linkClass|
       }}
         <nav>
-          <div class='px-4 py-2 text-sm text-gray'>Indexes</div>
+          {{!-- <div class='px-4 py-2 text-sm text-gray'>Indexes</div>
           {{#each @model.results as |item|}}
             <LinkTo
               @route='admin.indexes.item'
@@ -22,9 +22,11 @@
               <Icons::CircleMedium class='mr-1' />
               {{capitalize item.uid}}
             </LinkTo>
-          {{/each}}
-          {{! TODO: add link "create new index" }}
-          <div class='border-t my-4'></div>
+          {{/each}} --}}
+          <LinkTo @route='admin.indexes.index' class={{linkClass}}>
+            <Icons::FolderMultipleOutline class='mr-1' />
+            Indexes
+          </LinkTo>
           <LinkTo @route='admin.tasks.index' class={{linkClass}}>
             <Icons::FormatListChecks class='mr-1' />
             Tasks
diff --git a/app/templates/admin/index.hbs b/app/templates/admin/index.hbs
index 31a2d5d..10f7503 100644
--- a/app/templates/admin/index.hbs
+++ b/app/templates/admin/index.hbs
@@ -36,7 +36,7 @@
 </dl>
 
 <h2 class='text-2xl mb-4'>Indexes</h2>
-<RoyalTable @data={{@model.indexes}} class='w-full' as |Row data|>
+<RoyalTable @data={{@model.indexes.results}} class='w-full' as |Row data|>
   <Row as |Column|>
     <Column @name='UID' @prop='uid'>
       <LinkTo @route='admin.indexes.item' @model={{data.uid}}>
diff --git a/app/templates/admin/indexes/index.hbs b/app/templates/admin/indexes/index.hbs
index 3acb87c..692989f 100644
--- a/app/templates/admin/indexes/index.hbs
+++ b/app/templates/admin/indexes/index.hbs
@@ -2,7 +2,11 @@
 
 <RoyalTable @data={{@model.results}} class='w-full' as |Row data|>
   <Row as |Column|>
-    <Column @prop='uid' />
+    <Column @prop='uid'>
+      <LinkTo @route='admin.indexes.item' @model={{data.uid}}>
+        {{data.uid}}
+      </LinkTo>
+    </Column>
     <Column @prop='primaryKey' />
     <Column @prop='createdAt'>
       {{date-time-format