diff --git a/frontend/src/app/components/audit/audit.component.html b/frontend/src/app/components/audit/audit.component.html
index 54d13ec4d..37b4601e2 100644
--- a/frontend/src/app/components/audit/audit.component.html
+++ b/frontend/src/app/components/audit/audit.component.html
@@ -49,7 +49,10 @@ <h3 class='mat-subheading-2'>Rocketadmin can not find any tables</h3>
             <p class="mat-body-1">{{serverError.abstract}}</p>
         </ng-template>
         <div class="error-actions">
-            <a mat-stroked-button routerLink="/edit-db/{{connectionID}}">Connection settings</a>
+            <a mat-stroked-button *ngIf="accesLevel === 'edit'"
+                routerLink="/edit-db/{{connectionID}}">
+                Check database credentials
+            </a>
             <button *ngIf="isSaas" mat-flat-button color="warn" (click)="openIntercome()">Chat with support</button>
             <a *ngIf="!isSaas" mat-flat-button color="warn"
                 href="https://github.com/rocket-admin/rocketadmin/issues" target="_blank">
diff --git a/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts b/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts
index 1d92aa6b1..7fd51978d 100644
--- a/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts
+++ b/frontend/src/app/components/audit/info-dialog/info-dialog.component.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { Component, Inject, OnInit } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import { format } from 'date-fns'
 import { normalizeFieldName, normalizeTableName } from 'src/app/lib/normalize';
@@ -11,7 +12,8 @@ import { Log } from 'src/app/models/logs';
   styleUrls: ['./info-dialog.component.css'],
   imports: [
     CommonModule,
-    MatDialogModule
+    MatDialogModule,
+    MatButtonModule
   ]
 })
 export class InfoDialogComponent implements OnInit {
diff --git a/frontend/src/app/components/company/company.component.html b/frontend/src/app/components/company/company.component.html
index bd3dc9746..ccc4e3f7e 100644
--- a/frontend/src/app/components/company/company.component.html
+++ b/frontend/src/app/components/company/company.component.html
@@ -108,20 +108,20 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
                     [(ngModel)]="element.role"
                     (ngModelChange)="updateRole(element.id, element.role)">
                     <mat-option value="ADMIN" attr.data-testid="company-member-superadmin-role-{{i}}-select-option">
-                        Chief Account Officer
+                        Account Owner
                     </mat-option>
                     <mat-option value="DB_ADMIN" attr.data-testid="company-member-dbadmin-role-{{i}}-select-option">
                         System Admin
                     </mat-option>
                     <mat-option value="USER" attr.data-testid="company-member-user-role-{{i}}-select-option">
-                        Specialist
+                        Member
                     </mat-option>
                 </mat-select>
                 <ng-template #noSelect>
                     <span attr.data-testid="company-member-user-role-{{i}}-cell">
-                        {{element.role === "ADMIN" ? 'Chief Account Officer' : null}}
+                        {{element.role === "ADMIN" ? 'Account Owner' : null}}
                         {{element.role === "DB_ADMIN" ? 'System Admin' : null}}
-                        {{element.role === "USER" ? 'Specialist' : null}}
+                        {{element.role === "USER" ? 'Member' : null}}
                     </span>
                 </ng-template>
             </td>
@@ -204,5 +204,12 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
         <tr mat-header-row *matHeaderRowDef="membersTableDisplayedColumns" class="company-members-table-heading"></tr>
         <tr mat-row *matRowDef="let row; columns: membersTableDisplayedColumns;" class="company-member-row"></tr>
     </table>
+
+    <!--<mat-slide-toggle style="margin-top: 20px;" *ngIf="currentUser && currentUser.role === 'ADMIN'"
+        name="showTestConnections"
+        data-testid="company-test-connections-switch"
+        [(ngModel)]="company.show_test_connections">
+        Show test connections
+    </mat-slide-toggle>-->
 </div>
 
diff --git a/frontend/src/app/components/company/company.component.spec.ts b/frontend/src/app/components/company/company.component.spec.ts
index 32ada137f..8d832c2c9 100644
--- a/frontend/src/app/components/company/company.component.spec.ts
+++ b/frontend/src/app/components/company/company.component.spec.ts
@@ -77,7 +77,8 @@ describe('CompanyComponent', () => {
         "invitedUserEmail": "admin1@test.com",
         "role": CompanyMemberRole.CAO,
       }
-    ]
+    ],
+    show_test_connections: false
   }
 
   const mockMembers = [
diff --git a/frontend/src/app/components/company/company.component.ts b/frontend/src/app/components/company/company.component.ts
index f90fefb27..d2d8a7b3a 100644
--- a/frontend/src/app/components/company/company.component.ts
+++ b/frontend/src/app/components/company/company.component.ts
@@ -24,6 +24,7 @@ import { AlertComponent } from '../ui-components/alert/alert.component';
 import { PlaceholderCompanyComponent } from '../skeletons/placeholder-company/placeholder-company.component';
 import { PlaceholderTableDataComponent } from '../skeletons/placeholder-table-data/placeholder-table-data.component';
 import { NgIf } from '@angular/common';
+import { RouterModule } from '@angular/router';
 
 @Component({
   selector: 'app-company',
@@ -40,6 +41,7 @@ import { NgIf } from '@angular/common';
     MatSlideToggleModule,
     MatTooltipModule,
     MatTableModule,
+    RouterModule,
     Angulartics2OnModule,
     AlertComponent,
     PlaceholderCompanyComponent,
diff --git a/frontend/src/app/components/connection-settings/connection-settings.component.html b/frontend/src/app/components/connection-settings/connection-settings.component.html
index 8884ed14e..82ab098b3 100644
--- a/frontend/src/app/components/connection-settings/connection-settings.component.html
+++ b/frontend/src/app/components/connection-settings/connection-settings.component.html
@@ -24,7 +24,10 @@ <h3 class='mat-subheading-2'>Rocketadmin can not find any tables</h3>
                     <p class="mat-body-1">{{serverError.abstract}}</p>
                 </ng-template>
                 <div class="error-actions">
-                    <a mat-stroked-button routerLink="/edit-db/{{connectionID}}">Connection settings</a>
+                    <a mat-stroked-button *ngIf="accessLevel === 'edit'"
+                        routerLink="/edit-db/{{connectionID}}">
+                        Check database credentials
+                    </a>
                     <button *ngIf="isSaas" mat-flat-button color="warn" (click)="openIntercome()">Chat with support</button>
                     <a *ngIf="!isSaas" mat-flat-button color="warn"
                         href="https://github.com/rocket-admin/rocketadmin/issues" target="_blank">
diff --git a/frontend/src/app/components/dashboard/dashboard.component.html b/frontend/src/app/components/dashboard/dashboard.component.html
index de6d936f6..a90321bf9 100644
--- a/frontend/src/app/components/dashboard/dashboard.component.html
+++ b/frontend/src/app/components/dashboard/dashboard.component.html
@@ -9,7 +9,10 @@
         <p class="mat-body-1">{{serverError.abstract}}</p>
     </ng-template>
     <div class="error-actions">
-            <a mat-stroked-button routerLink="/edit-db/{{connectionID}}">Connection settings</a>
+            <a mat-stroked-button *ngIf="currentConnectionAccessLevel === 'edit'"
+                routerLink="/edit-db/{{connectionID}}">
+                Check database credentials
+            </a>
             <button *ngIf="isSaas" mat-flat-button color="warn" (click)="openIntercome()">Chat with support</button>
             <a *ngIf="!isSaas" mat-flat-button color="warn"
                 href="https://github.com/rocket-admin/rocketadmin/issues" target="_blank">
diff --git a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts
index 80b56091b..789e78b3f 100644
--- a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts
+++ b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts
@@ -8,6 +8,7 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { NotificationsService } from 'src/app/services/notifications.service';
 import { TableStateService } from 'src/app/services/table-state.service';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 @Component({
   selector: 'app-db-table-row-view',
@@ -17,6 +18,7 @@ import { TableStateService } from 'src/app/services/table-state.service';
     MatIconModule,
     MatButtonModule,
     ClipboardModule,
+    MatTooltipModule,
     RouterModule,
     CommonModule
   ]
diff --git a/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css b/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css
index 0ff312b2f..a692446f5 100644
--- a/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css
+++ b/frontend/src/app/components/ui-components/filter-fields/foreign-key/foreign-key.component.css
@@ -18,6 +18,10 @@
     grid-template-columns: 1fr 36px;
 }
 
+.foreign-key ::ng-deep .mat-mdc-form-field-subscript-wrapper {
+    margin-bottom: 16px;
+}
+
 .foreign-key__link {
     display: flex;
     /* align-items: center; */
diff --git a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css
index 8a65443a1..7e45a5324 100644
--- a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css
+++ b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.css
@@ -19,7 +19,7 @@
 }
 
 .foreign-key ::ng-deep .mat-mdc-form-field-subscript-wrapper {
-    margin-bottom: 8px;
+    margin-bottom: 16px;
 }
 
 .hint-link {
diff --git a/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts b/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts
index 9aa968d24..bcd315d13 100644
--- a/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts
+++ b/frontend/src/app/components/users/user-add-dialog/user-add-dialog.component.ts
@@ -12,6 +12,7 @@ import { MatSelectModule } from '@angular/material/select';
 import { MatButtonModule } from '@angular/material/button';
 import { PlaceholderAddUserDialogComponent } from '../../skeletons/placeholder-add-user-dialog/placeholder-add-user-dialog.component';
 import { NgForOf, NgIf } from '@angular/common';
+import { RouterModule } from '@angular/router';
 
 @Component({
   selector: 'app-user-add-dialog',
@@ -25,6 +26,7 @@ import { NgForOf, NgIf } from '@angular/common';
     MatFormFieldModule,
     MatSelectModule,
     MatButtonModule,
+    RouterModule,
     PlaceholderAddUserDialogComponent
   ]
 })
diff --git a/frontend/src/app/models/company.ts b/frontend/src/app/models/company.ts
index dd82dae77..039095eff 100644
--- a/frontend/src/app/models/company.ts
+++ b/frontend/src/app/models/company.ts
@@ -31,6 +31,7 @@ export interface Company {
     connections: CompanyConnection[],
     invitations: CompanyMemberInvitation[],
     is_payment_method_added: boolean,
+    show_test_connections: boolean
 }
 
 export interface CompanyMember {
diff --git a/frontend/src/app/services/payment.service.ts b/frontend/src/app/services/payment.service.ts
index d4bb57dc3..cba945854 100644
--- a/frontend/src/app/services/payment.service.ts
+++ b/frontend/src/app/services/payment.service.ts
@@ -21,7 +21,7 @@ export class PaymentService {
   createIntentToSubscription(companyId: string) {
     const config = this._configuration.getConfig();
 
-    return this._http.post<any>(config.saasURL + `/company/stripe/${companyId}`, {})
+    return this._http.post<any>(config.saasURL + `/saas/company/stripe/${companyId}`, {})
       .pipe(
         map(res => res),
         catchError((err) => {
@@ -41,7 +41,7 @@ export class PaymentService {
   createSubscription(companyId: string, defaultPaymentMethodId: string | null | PaymentMethod, subscriptionLevel: string) {
     const config = this._configuration.getConfig();
 
-    return this._http.post<any>(config.saasURL + `/company/setup/intent/${companyId}`, {defaultPaymentMethodId, subscriptionLevel})
+    return this._http.post<any>(config.saasURL + `/saas/company/setup/intent/${companyId}`, {defaultPaymentMethodId, subscriptionLevel})
       .pipe(
         map(res => res),
         catchError((err) => {
@@ -61,7 +61,7 @@ export class PaymentService {
   changeSubscription(companyId: string, subscriptionLevel: string) {
     const config = this._configuration.getConfig();
 
-    return this._http.post<any>(config.saasURL + `/company/subscription/upgrade/${companyId}`, {subscriptionLevel})
+    return this._http.post<any>(config.saasURL + `/saas/company/subscription/upgrade/${companyId}`, {subscriptionLevel})
       .pipe(
         map(res => res),
         catchError((err) => {