diff --git a/app/components/tab.hbs b/app/components/tab.hbs
index bad9fd8..7443775 100644
--- a/app/components/tab.hbs
+++ b/app/components/tab.hbs
@@ -3,6 +3,7 @@
   @models={{if @model (array @model) (if @models @models (array))}}
   @activeClass="text-primary border-b border-primary"
   class="flex items-center h-10 px-4 py-2 text-center text-base-2 no-underline bg-transparent whitespace-nowrap focus:outline-none"
+  ...attributes
 >
   {{#if @icon}}
     <@icon class="mr-2" />
diff --git a/app/templates/admin/indexes/item.hbs b/app/templates/admin/indexes/item.hbs
index f619016..fa64568 100644
--- a/app/templates/admin/indexes/item.hbs
+++ b/app/templates/admin/indexes/item.hbs
@@ -1,11 +1,16 @@
-<Headers::H1 @title={{capitalize @model.uid}}/>
+<Headers::H1 @title={{capitalize @model.uid}} />
 
 <Tabs>
-  <Tab @route="admin.indexes.item.documents" @text="Documents" />
-  <Tab @route="admin.indexes.item.info" @text="Info" />
-  <Tab @route="admin.indexes.item.settings" @text="Settings" />
-  <Tab @route="admin.indexes.item.edit" @text="Edit" />
-  <Tab @route="admin.indexes.item.delete" @text="Delete" />
+  <Tab @route='admin.indexes.item.documents' @text='Documents' />
+  <Tab @route='admin.indexes.item.info' @text='Info' />
+  <Tab @route='admin.indexes.item.settings' @text='Settings' />
+  <Tab @route='admin.indexes.item.edit' @text='Edit' />
+  <Tab @route='admin.indexes.item.delete' @text='Delete' />
+  <Tab
+    @route='admin.indexes.item.documents.new'
+    @text='Create new document'
+    class='ml-auto'
+  />
 </Tabs>
 
 {{outlet}}
diff --git a/app/templates/admin/indexes/item/documents/index.hbs b/app/templates/admin/indexes/item/documents/index.hbs
index d4a1e14..576c533 100644
--- a/app/templates/admin/indexes/item/documents/index.hbs
+++ b/app/templates/admin/indexes/item/documents/index.hbs
@@ -1,11 +1,3 @@
-<LinkTo
-  @route='admin.indexes.item.documents.new'
-  @model={{@model.index}}
-  class='inline-block mb-4'
->
-  Create new document
-</LinkTo>
-
 <div class='sm:flex sm:flex-nowrap'>
   {{! q }}
   <Form::Input