diff --git a/.gitignore b/.gitignore
index d902e3c4f..1ef6d2d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,6 @@
 /product_key.txt
 /*_product_key.txt
 .vscode/settings.json
-deploy_web.sh
\ No newline at end of file
+deploy_web.sh
+libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin
+libs/js_engine/src/artifacts/JS_SNAPSHOT.bin
\ No newline at end of file
diff --git a/frontend/projects/ui/src/app/app/global/services/unread-toast.service.ts b/frontend/projects/ui/src/app/app/global/services/unread-toast.service.ts
index 27ec741b6..3daee2a55 100644
--- a/frontend/projects/ui/src/app/app/global/services/unread-toast.service.ts
+++ b/frontend/projects/ui/src/app/app/global/services/unread-toast.service.ts
@@ -5,7 +5,7 @@ import {
   ToastController,
   ToastOptions,
 } from '@ionic/angular'
-import { EMPTY, merge, Observable } from 'rxjs'
+import { EMPTY, merge, Observable, ObservableInput } from 'rxjs'
 import { filter, pairwise, switchMap, tap } from 'rxjs/operators'
 import { ErrorToastService } from '@start9labs/shared'
 
@@ -13,6 +13,7 @@ import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
 import { ConfigService } from 'src/app/services/config.service'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { PatchDataService } from './patch-data.service'
+import { DataModel, ServerInfo } from 'src/app/services/patch-db/data-model'
 
 // Watch unread notification count to display toast
 @Injectable()
@@ -20,7 +21,7 @@ export class UnreadToastService extends Observable<unknown> {
   private unreadToast: HTMLIonToastElement
 
   private readonly stream$ = this.patchData.pipe(
-    switchMap(data => {
+    switchMap<DataModel | null, ObservableInput<number>>(data => {
       if (data) {
         return this.patch.watch$('server-info', 'unread-notification-count')
       }
@@ -36,6 +37,29 @@ export class UnreadToastService extends Observable<unknown> {
     }),
   )
 
+  TOAST: ToastOptions = {
+    header: 'Embassy',
+    message: `New notifications`,
+    position: 'bottom',
+    duration: 4000,
+    buttons: [
+      {
+        side: 'start',
+        icon: 'close',
+        handler: () => true,
+      },
+      {
+        side: 'end',
+        text: 'View',
+        handler: () => {
+          this.router.navigate(['/notifications'], {
+            queryParams: { toast: true },
+          })
+        },
+      },
+    ],
+  }
+
   constructor(
     private readonly router: Router,
     private readonly patchData: PatchDataService,
@@ -50,31 +74,9 @@ export class UnreadToastService extends Observable<unknown> {
   private async showToast() {
     await this.unreadToast?.dismiss()
 
-    this.unreadToast = await this.toastCtrl.create(TOAST)
-    this.unreadToast.buttons?.push({
-      side: 'end',
-      text: 'View',
-      handler: () => {
-        this.router.navigate(['/notifications'], {
-          queryParams: { toast: true },
-        })
-      },
-    })
+    this.unreadToast = await this.toastCtrl.create(this.TOAST)
+    this.unreadToast.buttons?.push()
 
     await this.unreadToast.present()
   }
 }
-
-const TOAST: ToastOptions = {
-  header: 'Embassy',
-  message: `New notifications`,
-  position: 'bottom',
-  duration: 4000,
-  buttons: [
-    {
-      side: 'start',
-      icon: 'close',
-      handler: () => true,
-    },
-  ],
-}
diff --git a/frontend/projects/ui/src/app/app/preloader/preloader.component.ts b/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
index b5393a724..3d5304f44 100644
--- a/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
+++ b/frontend/projects/ui/src/app/app/preloader/preloader.component.ts
@@ -7,6 +7,7 @@ const ICONS = [
   'alert-circle-outline',
   'aperture-outline',
   'arrow-back',
+  'arrow-forward',
   'arrow-up',
   'briefcase-outline',
   'bookmark-outline',
diff --git a/frontend/projects/ui/src/app/components/form-object/form-object.component.html b/frontend/projects/ui/src/app/components/form-object/form-object.component.html
index 78df5cd74..94367d7b6 100644
--- a/frontend/projects/ui/src/app/components/form-object/form-object.component.html
+++ b/frontend/projects/ui/src/app/components/form-object/form-object.component.html
@@ -304,6 +304,7 @@
               </ng-container>
               <!-- string or number -->
               <ion-item-group
+                [id]="getElementId(entry.key, i)"
                 *ngIf="spec.subtype === 'string' || spec.subtype === 'number'"
               >
                 <ion-item color="dark">
diff --git a/frontend/projects/ui/src/app/components/form-object/form-object.component.ts b/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
index c81f006c0..0c02c40ae 100644
--- a/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
+++ b/frontend/projects/ui/src/app/components/form-object/form-object.component.ts
@@ -141,23 +141,25 @@ export class FormObjectComponent {
 
     if (!newItem) return
 
+    const index = arr.length
+
     newItem.markAllAsTouched()
-    arr.insert(0, newItem)
+    arr.insert(index, newItem)
     if (['object', 'union'].includes(listSpec.subtype)) {
       const displayAs = (listSpec.spec as ListValueSpecOf<'object'>)[
         'display-as'
       ]
-      this.objectListDisplay[key].unshift({
+      this.objectListDisplay[key].push({
         height: '0px',
         expanded: true,
         displayAs: displayAs ? Mustache.render(displayAs, newItem.value) : '',
       })
-
-      pauseFor(200).then(() => {
-        this.objectListDisplay[key][0].height = this.getDocSize(key, 0)
-        this.onExpand.emit()
-      })
     }
+
+    pauseFor(400).then(() => {
+      const element = document.getElementById(this.getElementId(key, index))
+      element?.parentElement?.scrollIntoView({ behavior: 'smooth' })
+    })
   }
 
   toggleExpandObject(key: string) {
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
index 0bbf17131..47a519fb9 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.html
@@ -1,10 +1,18 @@
 <ion-icon
-  *ngIf="pkg.error; else bulb"
+  *ngIf="pkg.error; else noError"
   class="warning-icon"
   name="warning-outline"
   size="small"
   color="warning"
 ></ion-icon>
-<ng-template #bulb>
-  <div class="bulb" [style.background-color]="color"></div>
+<ng-template #noError>
+  <ion-spinner
+    *ngIf="pkg.transitioning; else bulb"
+    class="spinner"
+    size="small"
+    color="primary"
+  ></ion-spinner>
+  <ng-template #bulb>
+    <div class="bulb" [style.background-color]="color"></div>
+  </ng-template>
 </ng-template>
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
index 751ca35a1..0a8e75789 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-list/app-list-icon/app-list-icon.component.scss
@@ -18,3 +18,10 @@
   background-color: rgba(255, 213, 52, 0.1);
   box-shadow: 0 0 4px 4px rgba(255, 213, 52, 0.1);
 }
+
+.spinner {
+  position: absolute !important;
+  left: 6px !important;
+  top: 6px !important;
+  width: 18px;
+}
diff --git a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
index 9ede2a3b9..a71011a96 100644
--- a/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
+++ b/frontend/projects/ui/src/app/pages/apps-routes/app-show/components/app-show-health-checks/app-show-health-checks.component.ts
@@ -1,5 +1,4 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
-import { AlertController } from '@ionic/angular'
 import {
   HealthResult,
   PackageDataEntry,
@@ -20,8 +19,6 @@ export class AppShowHealthChecksComponent {
 
   HealthResult = HealthResult
 
-  constructor(private readonly alertCtrl: AlertController) {}
-
   isLoading(result: HealthResult): boolean {
     return result === HealthResult.Starting || result === HealthResult.Loading
   }
diff --git a/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts b/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts
index 8a13eaffe..d9ef79a99 100644
--- a/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts
+++ b/frontend/projects/ui/src/app/pages/server-routes/marketplaces/marketplaces.page.ts
@@ -12,7 +12,10 @@ import { ValueSpecObject } from 'src/app/pkg-config/config-types'
 import { GenericFormPage } from 'src/app/modals/generic-form/generic-form.page'
 import { PatchDbService } from '../../../services/patch-db/patch-db.service'
 import { v4 } from 'uuid'
-import { UIMarketplaceData } from '../../../services/patch-db/data-model'
+import {
+  UIData,
+  UIMarketplaceData,
+} from '../../../services/patch-db/data-model'
 import { ConfigService } from '../../../services/config.service'
 import { MarketplaceService } from 'src/app/services/marketplace.service'
 import {
@@ -54,10 +57,10 @@ export class MarketplacesPage {
     this.patch
       .watch$('ui')
       .pipe(
-        map(ui => ui.marketplace),
+        map((ui: UIData) => ui.marketplace),
         distinctUntilChanged(),
       )
-      .subscribe(mp => {
+      .subscribe((mp: UIMarketplaceData | undefined) => {
         let marketplaces: Marketplaces = [
           {
             id: undefined,
diff --git a/frontend/projects/ui/src/app/services/marketplace.service.ts b/frontend/projects/ui/src/app/services/marketplace.service.ts
index 67d08f885..46b04e28f 100644
--- a/frontend/projects/ui/src/app/services/marketplace.service.ts
+++ b/frontend/projects/ui/src/app/services/marketplace.service.ts
@@ -12,6 +12,7 @@ import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { ConfigService } from 'src/app/services/config.service'
 import {
   ServerInfo,
+  UIData,
   UIMarketplaceData,
 } from 'src/app/services/patch-db/data-model'
 import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
@@ -34,7 +35,7 @@ export class MarketplaceService extends AbstractMarketplaceService {
   private readonly altMarketplaceData$: Observable<
     UIMarketplaceData | undefined
   > = this.patch.watch$('ui').pipe(
-    map(ui => ui.marketplace),
+    map((ui: UIData) => ui.marketplace),
     distinctUntilChanged(),
     shareReplay({ bufferSize: 1, refCount: true }),
   )
diff --git a/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts b/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
index db9597d4c..b6ce47650 100644
--- a/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
+++ b/frontend/projects/ui/src/app/services/pkg-status-rendering.service.ts
@@ -16,11 +16,12 @@ export function renderPkgStatus(pkg: PackageDataEntry): PackageStatus {
   let primary: PrimaryStatus
   let dependency: DependencyStatus | null = null
   let health: HealthStatus | null = null
+  const hasHealthChecks = !isEmptyObject(pkg.manifest['health-checks'])
 
   if (pkg.state === PackageState.Installed && pkg.installed) {
     primary = getPrimaryStatus(pkg.installed.status)
     dependency = getDependencyStatus(pkg)
-    health = getHealthStatus(pkg.installed.status)
+    health = getHealthStatus(pkg.installed.status, hasHealthChecks)
   } else {
     primary = pkg.state as string as PrimaryStatus
   }
@@ -56,19 +57,24 @@ function getHealthStatus(
   }
 
   const values = Object.values(status.main.health)
+  console.log('HEALTH CHECKS', values)
 
   if (values.some(h => h.result === 'failure')) {
     return HealthStatus.Failure
   }
 
-  if (values.some(h => h.result === 'starting')) {
-    return HealthStatus.Starting
+  if (!values.length && hasHealthChecks) {
+    return HealthStatus.Waiting
   }
 
   if (values.some(h => h.result === 'loading')) {
     return HealthStatus.Loading
   }
 
+  if (values.some(h => !h.result || h.result === 'starting')) {
+    return HealthStatus.Starting
+  }
+
   return HealthStatus.Healthy
 }
 
@@ -101,6 +107,7 @@ export enum DependencyStatus {
 
 export enum HealthStatus {
   Failure = 'failure',
+  Waiting = 'waiting',
   Starting = 'starting',
   Loading = 'loading',
   Healthy = 'healthy',
diff --git a/frontend/projects/ui/src/app/util/get-package-info.ts b/frontend/projects/ui/src/app/util/get-package-info.ts
index f49d6df48..39e0339d6 100644
--- a/frontend/projects/ui/src/app/util/get-package-info.ts
+++ b/frontend/projects/ui/src/app/util/get-package-info.ts
@@ -12,14 +12,20 @@ import { packageLoadingProgress } from './package-loading-progress'
 
 export function getPackageInfo(entry: PackageDataEntry): PkgInfo {
   const statuses = renderPkgStatus(entry)
+  const primaryRendering = PrimaryRendering[statuses.primary]
 
   return {
     entry,
-    primaryRendering: PrimaryRendering[statuses.primary],
+    primaryRendering,
     installProgress: packageLoadingProgress(entry['install-progress']),
     error:
       statuses.health === HealthStatus.Failure ||
       statuses.dependency === DependencyStatus.Warning,
+    transitioning:
+      primaryRendering.showDots ||
+      statuses.health === HealthStatus.Waiting ||
+      statuses.health === HealthStatus.Loading ||
+      statuses.health === HealthStatus.Starting,
   }
 }
 
@@ -28,5 +34,6 @@ export interface PkgInfo {
   primaryRendering: StatusRendering
   installProgress: ProgressData | null
   error: boolean
+  transitioning: boolean
   sub?: Subscription | null
 }
diff --git a/frontend/proxy.conf-sample.json b/frontend/proxy.conf-sample.json
index 23bc247ca..0a1db349b 100644
--- a/frontend/proxy.conf-sample.json
+++ b/frontend/proxy.conf-sample.json
@@ -2,7 +2,7 @@
   "/rpc/v1": {
     "target": "http://<CHANGE_ME>/rpc/v1"
   },
-  "/ws/*": {
+  "/ws/db": {
     "target": "http://<CHANGE_ME>",
     "secure": false,
     "ws": true
diff --git a/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin b/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin
deleted file mode 100644
index 7b6059a90..000000000
Binary files a/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin and /dev/null differ
diff --git a/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin b/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin
deleted file mode 100644
index 9b86d3596..000000000
Binary files a/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin and /dev/null differ