diff --git a/readme.md b/readme.md
index 66a9fd62..b94d4ac2 100644
--- a/readme.md
+++ b/readme.md
@@ -22,7 +22,7 @@ Web Application is made using Laravel & VueJS while the Mobile Apps are built us
 - [Installation Steps](https://docs.craterapp.com/installation.html)
 - [User Guide](https://docs.craterapp.com/)
 - [Developer Guide](https://docs.craterapp.com/developer-guide.html)
-- [API Documentation](https://docs.craterapp.com/api-documentation.html)
+- [API Documentation](https://api-docs.craterapp.com)
 
 ## Download
 
diff --git a/resources/scripts/admin/views/estimates/Index.vue b/resources/scripts/admin/views/estimates/Index.vue
index f566031c..4ac22cd8 100644
--- a/resources/scripts/admin/views/estimates/Index.vue
+++ b/resources/scripts/admin/views/estimates/Index.vue
@@ -134,9 +134,9 @@
       >
         <!-- Tabs -->
         <BaseTabGroup class="-mb-5" @change="setStatusFilter">
+          <BaseTab :title="$t('general.all')" filter="" />
           <BaseTab :title="$t('general.draft')" filter="DRAFT" />
           <BaseTab :title="$t('general.sent')" filter="SENT" />
-          <BaseTab :title="$t('general.all')" filter="" />
         </BaseTabGroup>
 
         <BaseDropdown
diff --git a/resources/scripts/admin/views/invoices/Index.vue b/resources/scripts/admin/views/invoices/Index.vue
index 5a7f8ce5..d0cba28c 100644
--- a/resources/scripts/admin/views/invoices/Index.vue
+++ b/resources/scripts/admin/views/invoices/Index.vue
@@ -131,10 +131,10 @@
       >
         <!-- Tabs -->
         <BaseTabGroup class="-mb-5" @change="setStatusFilter">
-          <BaseTab :title="$t('general.draft')" filter="DRAFT" />
-          <BaseTab :title="$t('general.due')" filter="DUE" />
-          <BaseTab :title="$t('general.sent')" filter="SENT" />
           <BaseTab :title="$t('general.all')" filter="" />
+          <BaseTab :title="$t('general.draft')" filter="DRAFT" />
+          <BaseTab :title="$t('general.sent')" filter="SENT" />
+          <BaseTab :title="$t('general.due')" filter="DUE" />
         </BaseTabGroup>
 
         <BaseDropdown
diff --git a/resources/scripts/admin/views/recurring-invoices/Index.vue b/resources/scripts/admin/views/recurring-invoices/Index.vue
index 0af79302..7e6f9ee3 100644
--- a/resources/scripts/admin/views/recurring-invoices/Index.vue
+++ b/resources/scripts/admin/views/recurring-invoices/Index.vue
@@ -129,9 +129,9 @@
           :default-index="currentStatusIndex"
           @change="setStatusFilter"
         >
+          <BaseTab :title="$t('recurring_invoices.all')" filter="ALL" />
           <BaseTab :title="$t('recurring_invoices.active')" filter="ACTIVE" />
           <BaseTab :title="$t('recurring_invoices.on_hold')" filter="ON_HOLD" />
-          <BaseTab :title="$t('recurring_invoices.all')" filter="ALL" />
         </BaseTabGroup>
 
         <BaseDropdown