diff --git a/src/app/adf-services/df-service-details/df-paywall-modal.html b/src/app/adf-services/df-service-details/df-paywall-modal.html
index d5925f29..27cbc03e 100644
--- a/src/app/adf-services/df-service-details/df-paywall-modal.html
+++ b/src/app/adf-services/df-service-details/df-paywall-modal.html
@@ -1,3 +1,4 @@
+<!-- eslint-disable prettier/prettier -->
 <div class="app-container" style="padding: 12px 20px">
   <h1 mat-dialog-title style="text-align: center">Unlock Service</h1>
   <mat-dialog-content>
@@ -12,8 +13,7 @@ <h4>{{ 'paywall.hostedTrial' | transloco }}</h4>
         <div class="dynamic-width">
           <h4>{{ 'paywall.ossVersion' | transloco }}</h4>
           <p>
-            {{ 'paywall.signup' | transloco
-            }}<a
+            {{ 'paywall.signup' | transloco }}<a
               href="https://genie.dreamfactory.com/?utm_source=platform&utm_medium=paywall&utm_campaign=hosted"
               target="_blank"
               >{{ 'paywall.trial' | transloco }}</a
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts
index bb14e433..b6e3b073 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.ts
+++ b/src/app/adf-services/df-service-details/df-service-details.component.ts
@@ -132,7 +132,7 @@ export class DfServiceDetailsComponent implements OnInit {
         )
       )
       .subscribe(({ env, route }) => {
-        if (route['groups'][0] === 'Database') {
+        if (route['groups'] && route['groups'][0] === 'Database') {
           this.isDatabase = true;
         }
         const { data, serviceTypes, groups } = route;
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html
index 43fe0bb6..45f0ed49 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.html
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html
@@ -162,4 +162,4 @@ <h1 class="page-header">
       </mat-expansion-panel>
     </ng-template>
   </ng-container>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/styles.scss b/src/styles.scss
index b8088527..d13f49c6 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -102,6 +102,7 @@ mat-form-field {
   flex-wrap: wrap;
   gap: 16px;
   width: 100%;
+  padding-top: 6px;
   & .full-width {
     width: 100%;
   }