diff --git a/web/projects/marketplace/src/components/menu/menu.component.scss b/web/projects/marketplace/src/components/menu/menu.component.scss
index d4ab0817f..760aef902 100644
--- a/web/projects/marketplace/src/components/menu/menu.component.scss
+++ b/web/projects/marketplace/src/components/menu/menu.component.scss
@@ -54,7 +54,6 @@ header {
   }
 
   store-icon {
-    margin-bottom: 0.75rem;
     border-radius: 100%;
     height: 64px;
   }
diff --git a/web/projects/shared/src/components/initializing/logs-window.component.ts b/web/projects/shared/src/components/initializing/logs-window.component.ts
index e6279cb07..04f793409 100644
--- a/web/projects/shared/src/components/initializing/logs-window.component.ts
+++ b/web/projects/shared/src/components/initializing/logs-window.component.ts
@@ -48,6 +48,6 @@ export class LogsWindowComponent {
   }
 
   onBottom(entries: readonly IntersectionObserverEntry[]) {
-    this.scroll = entries[entries.length - 1].isIntersecting
+    this.scroll = !!entries[entries.length - 1]?.isIntersecting
   }
 }
diff --git a/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts b/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
index afdc48c48..cf149ac8c 100644
--- a/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
+++ b/web/projects/shared/src/pipes/unit-conversion/unit-conversion.pipe.ts
@@ -25,9 +25,12 @@ export function convertBytes(bytes: number): string {
 export class DurationToSecondsPipe implements PipeTransform {
   transform(duration?: string | null): number {
     if (!duration) return 0
-    const [, num, , unit] =
-      duration.match(/^([0-9]*(\.[0-9]+)?)(ns|µs|ms|s|m|d)$/) || []
-    return Number(num) * unitsToSeconds[unit]
+
+    const regex = /^([0-9]*(\.[0-9]+)?)(ns|µs|ms|s|m|d)$/
+    const [, num, , unit] = duration.match(regex) || []
+    const multiplier = (unit && unitsToSeconds[unit]) || NaN
+
+    return unit ? Number(num) * multiplier : NaN
   }
 }
 
diff --git a/web/projects/shared/styles/shared.scss b/web/projects/shared/styles/shared.scss
index b4be91ecc..3833f2b0b 100644
--- a/web/projects/shared/styles/shared.scss
+++ b/web/projects/shared/styles/shared.scss
@@ -294,13 +294,3 @@ a {
     margin-right: 0.5rem;
   }
 }
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-hr {
-  margin: 0;
-}
diff --git a/web/projects/ui/src/app/app.component.ts b/web/projects/ui/src/app/app.component.ts
index d51e3b675..24d7c04c9 100644
--- a/web/projects/ui/src/app/app.component.ts
+++ b/web/projects/ui/src/app/app.component.ts
@@ -42,7 +42,7 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.patch.watch$('ui').subscribe(({ name, language }) => {
       this.title.setTitle(name || 'StartOS')
-      this.i18n.setLanguage(language)
+      this.i18n.setLanguage(language || 'english')
     })
   }
 }
diff --git a/web/projects/ui/src/app/app.providers.ts b/web/projects/ui/src/app/app.providers.ts
index a6cdf76c3..e73746cb4 100644
--- a/web/projects/ui/src/app/app.providers.ts
+++ b/web/projects/ui/src/app/app.providers.ts
@@ -114,6 +114,6 @@ export function appInitializer(): () => void {
     auth.init()
     localStorage.init()
     router.initialNavigation()
-    i18n.setLanguage(i18n.language)
+    i18n.setLanguage(i18n.language || 'english')
   }
 }
diff --git a/web/projects/ui/src/app/i18n/i18n.service.ts b/web/projects/ui/src/app/i18n/i18n.service.ts
index f40f92b57..85f7d3a83 100644
--- a/web/projects/ui/src/app/i18n/i18n.service.ts
+++ b/web/projects/ui/src/app/i18n/i18n.service.ts
@@ -13,7 +13,7 @@ export class i18nService extends TuiLanguageSwitcherService {
 
   readonly loading = signal(false)
 
-  override setLanguage(language: TuiLanguageName): void {
+  override setLanguage(language: TuiLanguageName = 'english'): void {
     if (this.language === language) {
       return
     }
diff --git a/web/projects/ui/src/app/routes/diagnostic/logs/logs.page.html b/web/projects/ui/src/app/routes/diagnostic/logs/logs.page.html
index 86a5b7303..df2def9fc 100644
--- a/web/projects/ui/src/app/routes/diagnostic/logs/logs.page.html
+++ b/web/projects/ui/src/app/routes/diagnostic/logs/logs.page.html
@@ -11,7 +11,7 @@
   <section
     class="top"
     waIntersectionObserver
-    (waIntersectionObservee)="onTop($event[0].isIntersecting)"
+    (waIntersectionObservee)="onTop(!!$event[0]?.isIntersecting)"
   >
     @if (loading) {
     <tui-loader textContent="Loading logs" />
diff --git a/web/projects/ui/src/app/routes/portal/components/form/form-multiselect/form-multiselect.component.ts b/web/projects/ui/src/app/routes/portal/components/form/form-multiselect/form-multiselect.component.ts
index 9056e1e0f..f0b5a7934 100644
--- a/web/projects/ui/src/app/routes/portal/components/form/form-multiselect/form-multiselect.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/form/form-multiselect/form-multiselect.component.ts
@@ -16,7 +16,8 @@ export class FormMultiselectComponent extends Control<
 
   private readonly isDisabled = (item: string) =>
     Array.isArray(this.spec.disabled) &&
-    this.spec.disabled.includes(this.inverted[item])
+    !!this.inverted[item] &&
+    this.spec.disabled.includes(this.inverted[item]!)
 
   private readonly isExceedingLimit = (item: string) =>
     !!this.spec.maxLength &&
@@ -44,6 +45,6 @@ export class FormMultiselectComponent extends Control<
 
   @tuiPure
   private memoize(value: null | readonly string[]): string[] {
-    return value?.map(key => this.spec.values[key]) || []
+    return value?.map(key => this.spec.values[key] || '') || []
   }
 }
diff --git a/web/projects/ui/src/app/routes/portal/components/form/form-select/form-select.component.ts b/web/projects/ui/src/app/routes/portal/components/form/form-select/form-select.component.ts
index ac478a4d1..832a12489 100644
--- a/web/projects/ui/src/app/routes/portal/components/form/form-select/form-select.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/form/form-select/form-select.component.ts
@@ -14,7 +14,8 @@ export class FormSelectComponent extends Control<IST.ValueSpecSelect, string> {
 
   readonly disabledItemHandler = (item: string) =>
     Array.isArray(this.spec.disabled) &&
-    this.spec.disabled.includes(this.inverted[item])
+    !!this.inverted[item] &&
+    this.spec.disabled.includes(this.inverted[item]!)
 
   get disabled(): boolean {
     return typeof this.spec.disabled === 'string'
diff --git a/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.html b/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.html
index 1cb5bfe57..513007d65 100644
--- a/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.html
+++ b/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.html
@@ -6,6 +6,6 @@
 <tui-elastic-container class="g-form-group" formGroupName="value">
   <form-group
     class="group"
-    [spec]="(union && spec.variants[union].spec) || {}"
+    [spec]="(union && spec.variants[union]?.spec) || {}"
   ></form-group>
 </tui-elastic-container>
diff --git a/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.ts b/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.ts
index e8602eeb0..9d889a9fa 100644
--- a/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/form/form-union/form-union.component.ts
@@ -38,11 +38,11 @@ export class FormUnionComponent implements OnChanges {
 
   @tuiPure
   onUnion(union: string) {
-    this.values[this.union] = this.form.control.controls['value'].value
+    this.values[this.union] = this.form.control.controls['value']?.value
     this.form.control.setControl(
       'value',
       this.formService.getFormGroup(
-        union ? this.spec.variants[union].spec : {},
+        union ? this.spec.variants[union]?.spec || {} : {},
         [],
         this.values[union],
       ),
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/clearnet.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/clearnet.component.ts
index 13ff087e5..1c7eed0b3 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/clearnet.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/clearnet.component.ts
@@ -71,22 +71,14 @@ type ClearnetForm = {
         Make {{ isPublic() ? 'private' : 'public' }}
       </button>
       @if (clearnet().length) {
-        <button
-          tuiButton
-          iconStart="@tui.plus"
-          [style.margin-inline-start]="'auto'"
-          (click)="add()"
-        >
-          Add
-        </button>
+        <button tuiButton iconStart="@tui.plus" (click)="add()">Add</button>
       }
     </header>
     @if (clearnet().length) {
-      <table [appTable]="['Domain', 'ACME', 'URL', '']">
+      <table [appTable]="['ACME', 'URL', '']">
         @for (address of clearnet(); track $index) {
           <tr>
-            <td [style.width.rem]="15">{{ address.label }}</td>
-            <td>{{ address.acme | acme }}</td>
+            <td [style.width.rem]="12">{{ address.acme | acme }}</td>
             <td>{{ address.url | mask }}</td>
             <td [actions]="address.url">
               <button
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.utils.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.utils.ts
index bb718d8c8..c5fbf734d 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/interface.utils.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/interface.utils.ts
@@ -29,13 +29,14 @@ export function getAddresses(
   tor: AddressDetails[]
 } {
   const addressInfo = serviceInterface.addressInfo
-  const hostnames = host.hostnameInfo[addressInfo.internalPort].filter(
-    h =>
-      config.isLocalhost() ||
-      h.kind !== 'ip' ||
-      h.hostname.kind !== 'ipv6' ||
-      !h.hostname.value.startsWith('fe80::'),
-  )
+  const hostnames =
+    host.hostnameInfo[addressInfo.internalPort]?.filter(
+      h =>
+        config.isLocalhost() ||
+        h.kind !== 'ip' ||
+        h.hostname.kind !== 'ipv6' ||
+        !h.hostname.value.startsWith('fe80::'),
+    ) || []
 
   if (config.isLocalhost()) {
     const local = hostnames.find(
@@ -67,11 +68,10 @@ export function getAddresses(
     addresses.forEach(url => {
       if (h.kind === 'onion') {
         tor.push({
-          label: `Tor${
+          label:
             addresses.length > 1
-              ? ` (${new URL(url).protocol.replace(':', '').toUpperCase()})`
-              : ''
-          }`,
+              ? new URL(url).protocol.replace(':', '').toUpperCase()
+              : '',
           url,
         })
       } else {
@@ -79,14 +79,10 @@ export function getAddresses(
 
         if (h.public) {
           clearnet.push({
-            label:
-              hostnameKind == 'domain'
-                ? 'Domain'
-                : `${h.networkInterfaceId} (${hostnameKind})`,
             url,
             acme:
               hostnameKind == 'domain'
-                ? host.domains[h.hostname.domain]?.acme
+                ? host.domains[h.hostname.domain]?.acme || null
                 : null, // @TODO Matt make sure this is handled correctly - looks like ACME settings aren't built yet anyway, but ACME settings aren't *available* for public IPs
           })
         } else {
@@ -128,7 +124,7 @@ export type MappedServiceInterface = T.ServiceInterface & {
 }
 
 export type AddressDetails = {
-  label: string
+  label?: string
   url: string
   acme?: string | null
 }
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/local.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/local.component.ts
index f1a5e753b..1d0fa2860 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/local.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/local.component.ts
@@ -29,7 +29,7 @@ import { MaskPipe } from './mask.pipe'
     <table [appTable]="['Network Interface', 'URL', '']">
       @for (address of local(); track $index) {
         <tr>
-          <td [style.width.rem]="15">{{ address.label }}</td>
+          <td [style.width.rem]="12">{{ address.label }}</td>
           <td>{{ address.url | mask }}</td>
           <td [actions]="address.url"></td>
         </tr>
diff --git a/web/projects/ui/src/app/routes/portal/components/interfaces/tor.component.ts b/web/projects/ui/src/app/routes/portal/components/interfaces/tor.component.ts
index 2f8451ee4..a54ab3b86 100644
--- a/web/projects/ui/src/app/routes/portal/components/interfaces/tor.component.ts
+++ b/web/projects/ui/src/app/routes/portal/components/interfaces/tor.component.ts
@@ -15,7 +15,12 @@ import {
   TuiLink,
   TuiOption,
 } from '@taiga-ui/core'
-import { TUI_CONFIRM, TuiTooltip } from '@taiga-ui/kit'
+import {
+  TUI_CONFIRM,
+  TuiFade,
+  TuiFluidTypography,
+  TuiTooltip,
+} from '@taiga-ui/kit'
 import { defaultIfEmpty, firstValueFrom } from 'rxjs'
 import {
   FormComponent,
@@ -69,8 +74,12 @@ type OnionForm = {
       <table [appTable]="['Protocol', 'URL', '']">
         @for (address of tor(); track $index) {
           <tr>
-            <td [style.width.rem]="15">{{ address.label }}</td>
-            <td>{{ address.url | mask }}</td>
+            <td [style.width.rem]="12">{{ address.label }}</td>
+            <td>
+              <div [tuiFluidTypography]="[0.625, 0.8125]" tuiFade>
+                {{ address.url | mask }}
+              </div>
+            </td>
             <td [actions]="address.url">
               <button
                 tuiButton
@@ -99,6 +108,12 @@ type OnionForm = {
       </app-placeholder>
     }
   `,
+  styles: `
+    [tuiFade] {
+      white-space: nowrap;
+      max-width: 30rem;
+    }
+  `,
   host: { class: 'g-card' },
   imports: [
     TuiButton,
@@ -111,6 +126,8 @@ type OnionForm = {
     PlaceholderComponent,
     MaskPipe,
     InterfaceActionsComponent,
+    TuiFade,
+    TuiFluidTypography,
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/web/projects/ui/src/app/routes/portal/components/logs/logs-fetch.directive.ts b/web/projects/ui/src/app/routes/portal/components/logs/logs-fetch.directive.ts
index 7a4e52a93..a2b1a5941 100644
--- a/web/projects/ui/src/app/routes/portal/components/logs/logs-fetch.directive.ts
+++ b/web/projects/ui/src/app/routes/portal/components/logs/logs-fetch.directive.ts
@@ -15,7 +15,7 @@ export class LogsFetchDirective {
 
   @Output()
   readonly logsFetch = defer(() => this.observer).pipe(
-    filter(([{ isIntersecting }]) => isIntersecting && !this.component.scroll),
+    filter(([entry]) => !!entry?.isIntersecting && !this.component.scroll),
     switchMap(() =>
       from(
         this.component.fetchLogs({
diff --git a/web/projects/ui/src/app/routes/portal/components/logs/logs.component.html b/web/projects/ui/src/app/routes/portal/components/logs/logs.component.html
index c6e4d3d83..d47428b54 100644
--- a/web/projects/ui/src/app/routes/portal/components/logs/logs.component.html
+++ b/web/projects/ui/src/app/routes/portal/components/logs/logs.component.html
@@ -2,7 +2,7 @@
   <section
     class="top"
     waIntersectionObserver
-    (waIntersectionObservee)="onLoading($event[0].isIntersecting)"
+    (waIntersectionObservee)="onLoading(!!$event[0]?.isIntersecting)"
     (logsFetch)="onPrevious($event)"
   >
     @if (loading) {
@@ -41,7 +41,7 @@
     class="bottom"
     waIntersectionObserver
     (waIntersectionObservee)="
-      setScroll($event[$event.length - 1].isIntersecting)
+      setScroll(!!$event[$event.length - 1]?.isIntersecting)
     "
   ></section>
 </tui-scrollbar>
diff --git a/web/projects/ui/src/app/routes/portal/portal.routes.ts b/web/projects/ui/src/app/routes/portal/portal.routes.ts
index cbb0be9ea..e38e6c8c4 100644
--- a/web/projects/ui/src/app/routes/portal/portal.routes.ts
+++ b/web/projects/ui/src/app/routes/portal/portal.routes.ts
@@ -86,7 +86,7 @@ function toNavigationItem(
   const item = SYSTEM_UTILITIES[id]
   const routerLink = toRouterLink(id)
 
-  return SYSTEM_UTILITIES[id]
+  return item
     ? {
         icon: item.icon,
         title: item.title,
@@ -94,7 +94,7 @@ function toNavigationItem(
       }
     : {
         icon: packages[id]?.icon,
-        title: getManifest(packages[id]).title,
+        title: getManifest(packages[id]!).title,
         routerLink,
       }
 }
diff --git a/web/projects/ui/src/app/routes/portal/routes/logs/logs.component.ts b/web/projects/ui/src/app/routes/portal/routes/logs/logs.component.ts
index fc5afd5d0..257042b1c 100644
--- a/web/projects/ui/src/app/routes/portal/routes/logs/logs.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/logs/logs.component.ts
@@ -5,13 +5,7 @@ import {
   inject,
   signal,
 } from '@angular/core'
-import {
-  TuiAppearance,
-  TuiButton,
-  TuiIcon,
-  TuiLink,
-  TuiTitle,
-} from '@taiga-ui/core'
+import { TuiAppearance, TuiButton, TuiIcon, TuiTitle } from '@taiga-ui/core'
 import { TuiCardMedium } from '@taiga-ui/layout'
 import { LogsComponent } from 'src/app/routes/portal/components/logs/logs.component'
 import { RR } from 'src/app/services/api/api.types'
@@ -37,7 +31,7 @@ interface Log {
         >
           Back
         </button>
-        {{ logs[key].title }}
+        {{ logs[key]?.title }}
       } @else {
         Logs
       }
@@ -55,9 +49,9 @@ interface Log {
           >
             Close
           </button>
-          {{ logs[key].title }}
+          {{ logs[key]?.title }}
         </strong>
-        <p tuiSubtitle>{{ logs[key].subtitle }}</p>
+        <p tuiSubtitle>{{ logs[key]?.subtitle }}</p>
       </header>
       @for (log of logs | keyvalue; track $index) {
         @if (log.key === current()) {
@@ -169,7 +163,6 @@ interface Log {
     TuiCardMedium,
     TuiIcon,
     TuiAppearance,
-    TuiLink,
     TuiButton,
   ],
 })
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/action-request.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/action-request.component.ts
index c28127eb4..7adc990cc 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/action-request.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/action-request.component.ts
@@ -17,7 +17,7 @@ import { getManifest } from 'src/app/utils/get-package-data'
   selector: 'tr[actionRequest]',
   template: `
     <td>
-      <tui-avatar size="xs"><img [src]="pkg().icon" alt="" /></tui-avatar>
+      <tui-avatar size="xs"><img [src]="pkg()?.icon" alt="" /></tui-avatar>
       <span>{{ title() }}</span>
     </td>
     <td>
@@ -35,7 +35,7 @@ import { getManifest } from 'src/app/utils/get-package-data'
     </td>
     <td>
       <button tuiButton (click)="handle()">
-        {{ pkg().actions[actionRequest().actionId].name }}
+        {{ pkg()?.actions?.[actionRequest().actionId]?.name }}
       </button>
     </td>
   `,
@@ -79,19 +79,27 @@ export class ServiceActionRequestComponent {
   readonly services = input.required<Record<string, PackageDataEntry>>()
 
   readonly pkg = computed(() => this.services()[this.actionRequest().packageId])
-  readonly title = computed(() => getManifest(this.pkg()).title)
+  readonly title = computed((pkg = this.pkg()) => pkg && getManifest(pkg).title)
 
   async handle() {
+    const title = this.title()
+    const pkg = this.pkg()
+    const metadata = pkg?.actions[this.actionRequest().actionId]
+
+    if (!title || !pkg || !metadata) {
+      return
+    }
+
     this.actionService.present({
       pkgInfo: {
         id: this.actionRequest().packageId,
-        title: this.title(),
-        mainStatus: this.pkg().status.main,
-        icon: this.pkg().icon,
+        title,
+        mainStatus: pkg.status.main,
+        icon: pkg.icon,
       },
       actionInfo: {
         id: this.actionRequest().actionId,
-        metadata: this.pkg().actions[this.actionRequest().actionId],
+        metadata,
       },
       requestInfo: this.actionRequest(),
     })
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/action-requests.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/action-requests.component.ts
index 704c6777f..4fc65dfcd 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/action-requests.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/action-requests.component.ts
@@ -37,6 +37,7 @@ import { ServiceActionRequestComponent } from './action-request.component'
   `,
   styles: `
     :host {
+      min-height: 12rem;
       grid-column: span 6;
     }
   `,
@@ -50,7 +51,13 @@ export class ServiceActionRequestsComponent {
 
   readonly requests = computed(() =>
     Object.values(this.pkg().requestedActions)
-      .filter(r => r.active)
+      // @TODO Alex uncomment filter line below to produce infinite loop on service details page when dependency not installed. This means the page is infinitely trying to re-render
+      // .filter(r => r.active)
+      .filter(
+        r =>
+          this.services()[r.request.packageId]?.actions[r.request.actionId] &&
+          r.active,
+      )
       .sort((a, b) => a.request.severity.localeCompare(b.request.severity)),
   )
 }
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/controls.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/controls.component.ts
index 8527f4787..4613e0aa2 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/controls.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/controls.component.ts
@@ -16,10 +16,10 @@ import { getManifest } from 'src/app/utils/get-package-data'
 @Component({
   selector: 'service-controls',
   template: `
-    @if (['running', 'starting', 'restarting'].includes(status)) {
+    @if (status && ['running', 'starting', 'restarting'].includes(status)) {
       <button
         tuiButton
-        appearance="secondary-destructive"
+        appearance="primary-destructive"
         iconStart="@tui.square"
         (click)="controls.stop(manifest())"
       >
@@ -41,7 +41,7 @@ import { getManifest } from 'src/app/utils/get-package-data'
       <button
         tuiButton
         iconStart="@tui.play"
-        (click)="controls.start(manifest(), !!hasUnmet)"
+        (click)="controls.start(manifest(), !!hasUnmet())"
       >
         Start
       </button>
@@ -50,11 +50,12 @@ import { getManifest } from 'src/app/utils/get-package-data'
   styles: [
     `
       :host {
+        width: 100%;
+        max-width: 18rem;
         display: flex;
         flex-wrap: wrap;
         gap: 1rem;
         justify-content: center;
-        max-inline-size: 100%;
         margin-block-start: 1rem;
 
         &:nth-child(3) {
@@ -62,6 +63,11 @@ import { getManifest } from 'src/app/utils/get-package-data'
         }
       }
 
+      [tuiButton] {
+        flex: 1;
+        min-width: fit-content;
+      }
+
       :host-context(tui-root._mobile) {
         display: flex;
         margin: 0;
@@ -85,12 +91,13 @@ export class ServiceControlsComponent {
   pkg!: PackageDataEntry
 
   @Input({ required: true })
-  status!: PrimaryStatus
+  status?: PrimaryStatus
 
   readonly manifest = computed(() => getManifest(this.pkg))
 
   readonly controls = inject(ControlsService)
 
+  // @TODO Alex observable in signal?
   readonly hasUnmet = computed(() =>
     this.errors.getPkgDepErrors$(this.manifest().id).pipe(
       map(errors =>
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/dependencies.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/dependencies.component.ts
index 2d99e8311..14f61e6f1 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/dependencies.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/dependencies.component.ts
@@ -5,6 +5,7 @@ import { TuiIcon, TuiTitle } from '@taiga-ui/core'
 import { TuiAvatar } from '@taiga-ui/kit'
 import { TuiCell } from '@taiga-ui/layout'
 import { PlaceholderComponent } from 'src/app/routes/portal/components/placeholder.component'
+import { PkgDependencyErrors } from 'src/app/services/dep-error.service'
 import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
 
 @Component({
@@ -20,6 +21,11 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
         <tui-avatar><img alt="" [src]="d.value.icon" /></tui-avatar>
         <span tuiTitle>
           {{ d.value.title }}
+          @if (getError(d.key); as error) {
+            <span tuiSubtitle class="g-warning">{{ error }}</span>
+          } @else {
+            <span tuiSubtitle class="g-positive">Satisfied</span>
+          }
           <span tuiSubtitle>{{ d.value.versionRange }}</span>
         </span>
         <tui-icon icon="@tui.arrow-right" />
@@ -30,6 +36,7 @@ import { PackageDataEntry } from 'src/app/services/patch-db/data-model'
   `,
   styles: `
     :host {
+      min-height: 12rem;
       grid-column: span 3;
     }
   `,
@@ -52,4 +59,32 @@ export class ServiceDependenciesComponent {
 
   @Input({ required: true })
   services: Record<string, PackageDataEntry> = {}
+
+  @Input({ required: true })
+  errors: PkgDependencyErrors = {}
+
+  getError(id: string): string {
+    const depError = this.errors[id]
+
+    if (!depError) {
+      return ''
+    }
+
+    switch (depError.type) {
+      case 'notInstalled':
+        return 'Not installed'
+      case 'incorrectVersion':
+        return 'Incorrect version'
+      case 'notRunning':
+        return 'Not running'
+      case 'actionRequired':
+        return 'Action required'
+      case 'healthChecksFailed':
+        return 'Required health check not passing'
+      case 'transitive':
+        return 'Dependency has a dependency issue'
+      default:
+        return 'Unknown error'
+    }
+  }
 }
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/health-checks.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/health-checks.component.ts
index 26a088e84..e71805e03 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/health-checks.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/health-checks.component.ts
@@ -30,6 +30,7 @@ import { ServiceHealthCheckComponent } from './health-check.component'
   `,
   styles: `
     :host {
+      min-height: 12rem;
       grid-column: span 3;
     }
   `,
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/interfaces.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/interfaces.component.ts
index a0201526f..81f5b4482 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/interfaces.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/interfaces.component.ts
@@ -64,7 +64,7 @@ export class ServiceInterfacesComponent {
 
         return {
           ...value,
-          public: !!host?.bindings[value.addressInfo.internalPort].net.public,
+          public: !!host?.bindings[value.addressInfo.internalPort]?.net.public,
           addresses: host ? getAddresses(value, host, this.config) : {},
           routerLink: `./interface/${id}`,
         }
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/components/status.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/components/status.component.ts
index 0c6adb784..8d5fac35d 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/components/status.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/components/status.component.ts
@@ -27,7 +27,7 @@ import {
             <small>See below</small>
           }
 
-          @if (rendering.showDots) {
+          @if (rendering?.showDots) {
             <span class="loading-dots"></span>
           }
         </h3>
@@ -45,6 +45,7 @@ import {
         font: var(--tui-font-heading-4);
         font-weight: normal;
         margin: 0;
+        text-align: center;
       }
 
       div {
@@ -76,6 +77,10 @@ import {
           padding: 0.5rem 0;
         }
 
+        h3 {
+          text-align: left;
+        }
+
         small {
           text-align: left;
         }
@@ -89,7 +94,7 @@ import {
 })
 export class ServiceStatusComponent {
   @Input({ required: true })
-  status!: PrimaryStatus
+  status?: PrimaryStatus
 
   @Input()
   installingInfo?: InstallingInfo
@@ -98,13 +103,13 @@ export class ServiceStatusComponent {
   connected = false
 
   get text() {
-    return this.connected ? this.rendering.display : 'Unknown'
+    return this.connected ? this.rendering?.display : 'Unknown'
   }
 
   get class(): string | null {
     if (!this.connected) return null
 
-    switch (this.rendering.color) {
+    switch (this.rendering?.color) {
       case 'danger':
         return 'g-negative'
       case 'warning':
@@ -119,7 +124,7 @@ export class ServiceStatusComponent {
   }
 
   get rendering() {
-    return PrimaryRendering[this.status]
+    return this.status && PrimaryRendering[this.status]
   }
 
   getText(progress: T.Progress): string {
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/dashboard/controls.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/dashboard/controls.component.ts
index 7f0919c76..467fda1fa 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/dashboard/controls.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/dashboard/controls.component.ts
@@ -30,15 +30,6 @@ const RUNNING = ['running', 'starting', 'restarting']
       >
         Stop
       </button>
-
-      <button
-        tuiIconButton
-        iconStart="@tui.rotate-cw"
-        [disabled]="status().primary !== 'running'"
-        (click)="controls.restart(manifest())"
-      >
-        Restart
-      </button>
     } @else {
       <button
         *tuiLet="hasUnmet() | async as hasUnmet"
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts
index 82c6eb68d..3239bef05 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/modals/action-input.component.ts
@@ -181,7 +181,7 @@ export class ActionInputModal {
       .filter(
         id =>
           id !== this.pkgInfo.id &&
-          Object.values(packages[id].requestedActions).some(
+          Object.values(packages[id]!.requestedActions).some(
             ({ request, active }) =>
               !active &&
               request.severity === 'critical' &&
@@ -201,7 +201,7 @@ export class ActionInputModal {
     const message =
       'As a result of this change, the following services will no longer work properly and may crash:<ul>'
     const content = `${message}${breakages.map(
-      id => `<li><b>${getManifest(packages[id]).title}</b></li>`,
+      id => `<li><b>${getManifest(packages[id]!).title}</b></li>`,
     )}</ul>`
     const data: TuiConfirmData = { content, yes: 'Continue', no: 'Cancel' }
 
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/routes/about.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/routes/about.component.ts
index d7507f215..fb21726cd 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/routes/about.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/routes/about.component.ts
@@ -14,39 +14,44 @@ import { map } from 'rxjs'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { getManifest } from 'src/app/utils/get-package-data'
 import {
+  AdditionalItem,
   FALLBACK_URL,
   ServiceAdditionalItemComponent,
 } from '../components/additional-item.component'
+import { KeyValuePipe } from '@angular/common'
 
 @Component({
   template: `
-    <section class="g-card">
-      @for (additional of items(); track $index) {
-        @if (additional.description.startsWith('http')) {
-          <a tuiCell [additionalItem]="additional"></a>
-        } @else {
-          <button
-            tuiCell
-            [style.pointer-events]="!additional.icon ? 'none' : null"
-            [additionalItem]="additional"
-            (click)="additional.action?.()"
-          ></button>
+    @for (group of items() | keyvalue; track $index) {
+      <section class="g-card">
+        <header>{{ group.key }}</header>
+        @for (additional of group.value; track $index) {
+          @if (additional.description.startsWith('http')) {
+            <a tuiCell [additionalItem]="additional"></a>
+          } @else {
+            <button
+              tuiCell
+              [style.pointer-events]="!additional.icon ? 'none' : null"
+              [additionalItem]="additional"
+              (click)="additional.action?.()"
+            ></button>
+          }
         }
-      }
-    </section>
+      </section>
+    }
   `,
   styles: `
     section {
+      max-width: 42rem;
       display: flex;
       flex-direction: column;
-      max-width: 36rem;
-      padding: 0.5rem 1rem;
+      margin-bottom: 2rem;
     }
   `,
+  host: { class: 'g-subpage' },
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  host: { class: 'g-subpage' },
-  imports: [ServiceAdditionalItemComponent, TuiCell],
+  imports: [ServiceAdditionalItemComponent, TuiCell, KeyValuePipe],
 })
 export default class ServiceAboutRoute {
   private readonly copyService = inject(CopyService)
@@ -55,56 +60,62 @@ export default class ServiceAboutRoute {
     { label: 'License', size: 'l' },
   )
 
-  readonly items = toSignal(
+  readonly items = toSignal<Record<string, AdditionalItem[]>>(
     inject<PatchDB<DataModel>>(PatchDB)
       .watch$('packageData', getPkgId())
       .pipe(
         map(pkg => {
           const manifest = getManifest(pkg)
 
-          return [
-            {
-              name: 'Version',
-              description: manifest.version,
-            },
-            {
-              name: 'Git Hash',
-              description: manifest.gitHash || 'Unknown',
-              icon: manifest.gitHash ? '@tui.copy' : '',
-              action: () =>
-                manifest.gitHash && this.copyService.copy(manifest.gitHash),
-            },
-            {
-              name: 'License',
-              description: manifest.license,
-              icon: '@tui.chevron-right',
-              action: () => this.markdown.subscribe(),
-            },
-            {
-              name: 'Website',
-              description: manifest.marketingSite || FALLBACK_URL,
-            },
-            {
-              name: 'Donation Link',
-              description: manifest.donationUrl || FALLBACK_URL,
-            },
-            {
-              name: 'Source Repository',
-              description: manifest.upstreamRepo,
-            },
-            {
-              name: 'Support Site',
-              description: manifest.supportSite || FALLBACK_URL,
-            },
-            {
-              name: 'Registry',
-              description: pkg.registry || FALLBACK_URL,
-            },
-            {
-              name: 'Binary Source',
-              description: manifest.wrapperRepo,
-            },
-          ]
+          return {
+            General: [
+              {
+                name: 'Version',
+                description: manifest.version,
+                icon: '@tui.copy',
+                action: () => this.copyService.copy(manifest.version),
+              },
+              {
+                name: 'Git Hash',
+                description: manifest.gitHash || 'Unknown',
+                icon: manifest.gitHash ? '@tui.copy' : '',
+                action: () =>
+                  manifest.gitHash && this.copyService.copy(manifest.gitHash),
+              },
+              {
+                name: 'License',
+                description: manifest.license,
+                icon: '@tui.chevron-right',
+                action: () => this.markdown.subscribe(),
+              },
+            ],
+            Links: [
+              {
+                name: 'Installed From',
+                description: pkg.registry || FALLBACK_URL,
+              },
+              {
+                name: 'Service Repository',
+                description: manifest.upstreamRepo,
+              },
+              {
+                name: 'Package Repository',
+                description: manifest.wrapperRepo,
+              },
+              {
+                name: 'Marketing Site',
+                description: manifest.marketingSite || FALLBACK_URL,
+              },
+              {
+                name: 'Support Site',
+                description: manifest.supportSite || FALLBACK_URL,
+              },
+              {
+                name: 'Donation Link',
+                description: manifest.donationUrl || FALLBACK_URL,
+              },
+            ],
+          }
         }),
       ),
   )
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/routes/actions.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/routes/actions.component.ts
index 291a51335..532ed0b7c 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/routes/actions.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/routes/actions.component.ts
@@ -12,24 +12,11 @@ import { StandardActionsService } from 'src/app/services/standard-actions.servic
 import { getManifest } from 'src/app/utils/get-package-data'
 import { ServiceActionComponent } from '../components/action.component'
 
-const OTHER = 'Other Custom Actions'
+const OTHER = 'Custom Actions'
 
 @Component({
   template: `
     @if (package(); as pkg) {
-      <section class="g-card">
-        <header>Standard Actions</header>
-        <button
-          tuiCell
-          [action]="rebuild"
-          (click)="service.rebuild(pkg.manifest.id)"
-        ></button>
-        <button
-          tuiCell
-          [action]="uninstall"
-          (click)="service.uninstall(pkg.manifest)"
-        ></button>
-      </section>
       @for (group of pkg.actions | keyvalue; track $index) {
         @if (group.value.length) {
           <section class="g-card">
@@ -46,6 +33,19 @@ const OTHER = 'Other Custom Actions'
           </section>
         }
       }
+      <section class="g-card">
+        <header>Standard Actions</header>
+        <button
+          tuiCell
+          [action]="rebuild"
+          (click)="service.rebuild(pkg.manifest.id)"
+        ></button>
+        <button
+          tuiCell
+          [action]="uninstall"
+          (click)="service.uninstall(pkg.manifest)"
+        ></button>
+      </section>
     }
   `,
   styles: `
@@ -80,8 +80,8 @@ export default class ServiceActionsRoute {
               Record<string, ReadonlyArray<T.ActionMetadata & { id: string }>>
             >(
               (acc, [id]) => {
-                const action = { id, ...pkg.actions[id] }
-                const group = pkg.actions[id].group || OTHER
+                const action = { id, ...pkg.actions[id]! }
+                const group = pkg.actions[id]?.group || OTHER
                 const current = acc[group] || []
 
                 return { ...acc, [group]: current.concat(action) }
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/routes/interface.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/routes/interface.component.ts
index 815663b27..5c48730d6 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/routes/interface.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/routes/interface.component.ts
@@ -1,4 +1,3 @@
-import { NgTemplateOutlet } from '@angular/common'
 import {
   ChangeDetectionStrategy,
   Component,
@@ -11,7 +10,7 @@ import { RouterLink } from '@angular/router'
 import { getPkgId } from '@start9labs/shared'
 import { TuiItem } from '@taiga-ui/cdk'
 import { TuiButton, TuiLink } from '@taiga-ui/core'
-import { TuiBadge, TuiBreadcrumbs } from '@taiga-ui/kit'
+import { TuiBreadcrumbs } from '@taiga-ui/kit'
 import { PatchDB } from 'patch-db-client'
 import { InterfaceComponent } from 'src/app/routes/portal/components/interfaces/interface.component'
 import { getAddresses } from 'src/app/routes/portal/components/interfaces/interface.utils'
@@ -59,8 +58,6 @@ import { TitleDirective } from 'src/app/services/title.service'
     TuiBreadcrumbs,
     TuiItem,
     TuiLink,
-    TuiBadge,
-    NgTemplateOutlet,
     InterfaceStatusComponent,
   ],
 })
@@ -84,11 +81,16 @@ export default class ServiceInterfaceRoute {
 
     const { serviceInterfaces, hosts } = pkg
     const item = serviceInterfaces[this.interfaceId()]
-    const host = hosts[item.addressInfo.hostId]
+    const key = item?.addressInfo.hostId || ''
+    const host = hosts[key]
+
+    if (!host || !item) {
+      return
+    }
 
     return {
       ...item,
-      public: host.bindings[item.addressInfo.internalPort].net.public,
+      public: !!host?.bindings[item.addressInfo.internalPort]?.net.public,
       addresses: getAddresses(item, host, this.config),
     }
   })
diff --git a/web/projects/ui/src/app/routes/portal/routes/services/routes/service.component.ts b/web/projects/ui/src/app/routes/portal/routes/services/routes/service.component.ts
index c9eceb7bc..d492bb0c9 100644
--- a/web/projects/ui/src/app/routes/portal/routes/services/routes/service.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/services/routes/service.component.ts
@@ -10,9 +10,10 @@ import { ActivatedRoute } from '@angular/router'
 import { isEmptyObject } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { PatchDB } from 'patch-db-client'
-import { map } from 'rxjs'
+import { map, of } from 'rxjs'
 import { UptimeComponent } from 'src/app/routes/portal/components/uptime.component'
 import { ConnectionService } from 'src/app/services/connection.service'
+import { DepErrorService } from 'src/app/services/dep-error.service'
 import {
   DataModel,
   PackageDataEntry,
@@ -31,31 +32,36 @@ import { ServiceStatusComponent } from '../components/status.component'
   template: `
     <service-status
       [connected]="!!connected()"
-      [installingInfo]="pkg().stateInfo.installingInfo"
+      [installingInfo]="pkg()?.stateInfo?.installingInfo"
       [status]="status()"
     >
-      @if ($any(pkg().status).started; as started) {
+      @if ($any(pkg()?.status)?.started; as started) {
         <p class="g-secondary" [appUptime]="started"></p>
       }
-      @if (installed() && connected()) {
-        <service-controls [pkg]="pkg()" [status]="status()" />
+      @if (installed() && connected() && pkg(); as pkg) {
+        <service-controls [pkg]="pkg" [status]="status()" />
       }
     </service-status>
 
-    @if (installed()) {
-      @if (pkg().status.main === 'error') {
-        <service-error [pkg]="pkg()" />
+    @if (installed() && pkg(); as pkg) {
+      @if (pkg.status.main === 'error') {
+        <service-error [pkg]="pkg" />
+      }
+      <service-interfaces [pkg]="pkg" [disabled]="status() !== 'running'" />
+      @if (errors() | async; as errors) {
+        <service-dependencies
+          [pkg]="pkg"
+          [services]="services()"
+          [errors]="errors"
+        />
       }
-
-      <service-interfaces [pkg]="pkg()" [disabled]="status() !== 'running'" />
-      <service-dependencies [pkg]="pkg()" [services]="services()" />
       <service-health-checks [checks]="health()" />
-      <service-action-requests [pkg]="pkg()" [services]="services()" />
+      <service-action-requests [pkg]="pkg" [services]="services() || {}" />
     }
 
-    @if (installing()) {
+    @if (installing() && pkg(); as pkg) {
       @for (
-        item of pkg().stateInfo.installingInfo?.progress?.phases;
+        item of pkg.stateInfo.installingInfo?.progress?.phases;
         track $index
       ) {
         <p [progress]="item.progress">{{ item.name }}</p>
@@ -100,6 +106,7 @@ import { ServiceStatusComponent } from '../components/status.component'
   ],
 })
 export class ServiceRoute {
+  private readonly errorService = inject(DepErrorService)
   protected readonly connected = toSignal(inject(ConnectionService))
 
   protected readonly id = toSignal(
@@ -111,10 +118,14 @@ export class ServiceRoute {
     { initialValue: {} as Record<string, PackageDataEntry> },
   )
 
+  protected readonly errors = computed((id = this.id()) =>
+    id ? this.errorService.getPkgDepErrors$(id) : of({}),
+  )
+
   protected readonly pkg = computed(() => this.services()[this.id() || ''])
 
-  protected readonly health = computed(() =>
-    this.pkg() ? toHealthCheck(this.pkg().status) : [],
+  protected readonly health = computed((pkg = this.pkg()) =>
+    pkg ? toHealthCheck(pkg.status) : [],
   )
 
   protected readonly status = computed((pkg = this.pkg()) =>
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/acme/acme.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/acme/acme.component.ts
index abf7d806e..5e947f810 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/acme/acme.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/acme/acme.component.ts
@@ -120,9 +120,9 @@ export default class SystemAcmeComponent {
     this.patch.watch$('serverInfo', 'network', 'acme').pipe(
       map(acme =>
         Object.keys(acme).map(url => {
-          const contact = acme[url].contact.map(mailto =>
-            mailto.replace('mailto:', ''),
-          )
+          const contact =
+            acme[url]?.contact.map(mailto => mailto.replace('mailto:', '')) ||
+            []
           return {
             url,
             contact,
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.component.ts
index ab011e301..5b1efcfd7 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.component.ts
@@ -136,7 +136,7 @@ export class BackupsBackupComponent {
           // existing backup
         } else {
           try {
-            argon2.verify(entry.startOs[id].passwordHash!, password)
+            argon2.verify(entry.startOs[id]?.passwordHash!, password)
             await this.createBackup(password)
           } catch {
             this.oldPassword(password)
@@ -156,7 +156,7 @@ export class BackupsBackupComponent {
 
   private async oldPassword(password: string) {
     const { id } = await getServerInfo(this.patch)
-    const { passwordHash } = this.context.data.entry.startOs[id]
+    const { passwordHash = '' } = this.context.data.entry.startOs[id] || {}
 
     this.dialogs
       .open<string>(PROMPT, PASSWORD_OPTIONS)
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.service.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.service.ts
index 3c6e7d4c0..4e36dc59c 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.service.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/backup.service.ts
@@ -68,10 +68,11 @@ export class BackupService {
   }
 
   hasThisBackup({ startOs }: BackupTarget, id: string): boolean {
+    const item = startOs[id]
+
     return (
-      startOs[id] &&
-      Version.parse(startOs[id].version).compare(Version.parse('0.3.6')) !==
-        'less'
+      !!item &&
+      Version.parse(item.version).compare(Version.parse('0.3.6')) !== 'less'
     )
   }
 }
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/network.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/network.component.ts
index 850fef900..d8a461e53 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/network.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/network.component.ts
@@ -8,9 +8,8 @@ import { ActivatedRoute } from '@angular/router'
 import { ErrorService, LoadingService } from '@start9labs/shared'
 import { ISB } from '@start9labs/start-sdk'
 import { TuiResponsiveDialogService } from '@taiga-ui/addon-mobile'
-import { TuiAlertService, TuiButton, TuiIcon, TuiTitle } from '@taiga-ui/core'
+import { TuiAlertService, TuiButton, TuiIcon } from '@taiga-ui/core'
 import { TUI_CONFIRM, TuiTooltip } from '@taiga-ui/kit'
-import { TuiCell } from '@taiga-ui/layout'
 import { filter } from 'rxjs'
 import { FormComponent } from 'src/app/routes/portal/components/form.component'
 import { PlaceholderComponent } from 'src/app/routes/portal/components/placeholder.component'
@@ -232,7 +231,7 @@ export class BackupNetworkComponent {
                   ...value,
                 })
 
-                target.entry = Object.values(res)[0]
+                target.entry = Object.values(res)[0]!
                 this.service.cifs.update(cifs => [...cifs])
                 return true
               } catch (e: any) {
@@ -273,7 +272,13 @@ export class BackupNetworkComponent {
       .subscribe()
 
     try {
-      const [[id, entry]] = Object.entries(await this.api.addBackupTarget(v))
+      const [item] = Object.entries(await this.api.addBackupTarget(v))
+      const [id, entry] = item || []
+
+      if (!id || !entry) {
+        throw 'Invalid response from server'
+      }
+
       const hasAnyBackup = this.service.hasAnyBackup(entry)
       const added = { id, entry, hasAnyBackup }
       this.service.cifs.update(cifs => [added, ...cifs])
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/recover.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/recover.component.ts
index 83d26fe1a..cf891145d 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/recover.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/backups/recover.component.ts
@@ -91,12 +91,12 @@ export class BackupsRecoverComponent {
 
           return Object.keys(backups)
             .map(id => ({
-              ...backups[id],
+              ...backups[id]!,
               id,
               installed: !!packageData[id],
               checked: false,
               newerOs:
-                Version.parse(backups[id].osVersion).compare(
+                Version.parse(backups[id]?.osVersion || '').compare(
                   Version.parse(this.config.version),
                 ) === 'greater',
             }))
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/general/snek.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/general/snek.component.ts
index bd5a45624..5f220ce9f 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/general/snek.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/general/snek.component.ts
@@ -142,8 +142,8 @@ export class SnekComponent implements AfterViewInit, OnDestroy {
 
   handleTouchStart(evt: TouchEvent) {
     const firstTouch = this.getTouches(evt)[0]
-    this.xDown = firstTouch.clientX
-    this.yDown = firstTouch.clientY
+    this.xDown = firstTouch?.clientX
+    this.yDown = firstTouch?.clientY
   }
 
   handleTouchMove(evt: TouchEvent) {
@@ -151,8 +151,8 @@ export class SnekComponent implements AfterViewInit, OnDestroy {
       return
     }
 
-    var xUp = evt.touches[0].clientX
-    var yUp = evt.touches[0].clientY
+    var xUp = evt.touches[0]?.clientX || 0
+    var yUp = evt.touches[0]?.clientY || 0
 
     var xDiff = this.xDown - xUp
     var yDiff = this.yDown - yUp
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/general/update.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/general/update.component.ts
index bfa52da6f..66f84d851 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/general/update.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/general/update.component.ts
@@ -18,7 +18,7 @@ import { EOSService } from 'src/app/services/eos.service'
 
 @Component({
   template: `
-    <h2 style="margin-top: 0">StartOS {{ versions[0].version }}</h2>
+    <h2 style="margin-top: 0">StartOS {{ versions[0]?.version }}</h2>
     <h3 style="color: var(--tui-text-secondary); font-weight: normal">
       Release Notes
     </h3>
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/interfaces/interfaces.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/interfaces/interfaces.component.ts
index 3bc241cdf..1a3c23f70 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/interfaces/interfaces.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/interfaces/interfaces.component.ts
@@ -72,7 +72,7 @@ export default class StartOsUiComponent {
       .pipe(
         map(host => ({
           ...iface,
-          public: host.bindings[iface.addressInfo.internalPort].net.public,
+          public: !!host.bindings[iface.addressInfo.internalPort]?.net.public,
           addresses: getAddresses(iface, host, this.config),
         })),
       ),
diff --git a/web/projects/ui/src/app/routes/portal/routes/system/routes/sessions/sessions.component.ts b/web/projects/ui/src/app/routes/portal/routes/system/routes/sessions/sessions.component.ts
index 89234a831..5add20815 100644
--- a/web/projects/ui/src/app/routes/portal/routes/system/routes/sessions/sessions.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/system/routes/sessions/sessions.component.ts
@@ -70,7 +70,13 @@ export default class SystemSessionsComponent {
   private readonly sessions$ = from(this.api.getSessions({}))
   private readonly local$ = new Subject<readonly SessionWithId[]>()
 
-  readonly current$ = this.sessions$.pipe(map(s => [s.sessions[s.current]]))
+  readonly current$ = this.sessions$.pipe(
+    map(s => {
+      const current = s.sessions[s.current]
+
+      return current ? [current] : []
+    }),
+  )
   readonly other$: Observable<readonly SessionWithId[]> = merge(
     this.local$,
     this.sessions$.pipe(
diff --git a/web/projects/ui/src/app/routes/portal/routes/updates/updates.component.ts b/web/projects/ui/src/app/routes/portal/routes/updates/updates.component.ts
index 314ae4985..86709ab53 100644
--- a/web/projects/ui/src/app/routes/portal/routes/updates/updates.component.ts
+++ b/web/projects/ui/src/app/routes/portal/routes/updates/updates.component.ts
@@ -10,7 +10,6 @@ import {
   StoreIconComponentModule,
   StoreIdentity,
 } from '@start9labs/marketplace'
-import { TuiTable } from '@taiga-ui/addon-table'
 import { TUI_IS_MOBILE } from '@taiga-ui/cdk'
 import { TuiButton, TuiNotification, TuiTitle } from '@taiga-ui/core'
 import {
@@ -88,7 +87,10 @@ interface UpdatesData {
     </aside>
     <section class="g-subpage">
       @if (data()?.errors?.includes(current()?.url || '')) {
-        <tui-notification appearance="negative">
+        <tui-notification
+          appearance="negative"
+          [style.margin-block-end.rem]="1"
+        >
           Request Failed
         </tui-notification>
       }
@@ -222,7 +224,9 @@ export default class UpdatesComponent {
     combineLatest({
       hosts: this.marketplaceService
         .getKnownHosts$(true)
-        .pipe(tap(([store]) => !this.isMobile && this.current.set(store))),
+        .pipe(
+          tap(([store]) => !this.isMobile && store && this.current.set(store)),
+        ),
       marketplace: this.marketplaceService.marketplace$,
       localPkgs: inject<PatchDB<DataModel>>(PatchDB)
         .watch$('packageData')
diff --git a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
index 603acbe2a..51ee24ca6 100644
--- a/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
+++ b/web/projects/ui/src/app/services/api/embassy-mock-api.service.ts
@@ -501,9 +501,9 @@ export class MockApiService extends ApiService {
   ): Promise<GetPackageRes> {
     await pauseFor(2000)
     if (!versionRange || versionRange === '=*') {
-      return Mock.RegistryPackages[id]
+      return Mock.RegistryPackages[id]!
     } else {
-      return Mock.OtherPackageVersions[id][versionRange]
+      return Mock.OtherPackageVersions[id]![versionRange]!
     }
   }
 
@@ -870,7 +870,7 @@ export class MockApiService extends ApiService {
 
         this.mockRevision([
           {
-            ...appPatch[0],
+            ...appPatch[0]!,
             value: 'stopped',
           },
         ])
@@ -1055,18 +1055,18 @@ export class MockApiService extends ApiService {
         op: PatchOp.ADD,
         path: `/packageData/${params.id}`,
         value: {
-          ...Mock.LocalPkgs[params.id],
+          ...Mock.LocalPkgs[params.id]!,
           stateInfo: {
             // if installing
             // state: 'installing',
 
             // if updating
             state: 'updating',
-            manifest: mockPatchData.packageData[params.id].stateInfo.manifest!,
+            manifest: mockPatchData.packageData[params.id]?.stateInfo.manifest!,
 
             // both
             installingInfo: {
-              newManifest: Mock.LocalPkgs[params.id].stateInfo.manifest,
+              newManifest: Mock.LocalPkgs[params.id]?.stateInfo.manifest!,
               progress: PROGRESS,
             },
           },
@@ -1123,11 +1123,11 @@ export class MockApiService extends ApiService {
         op: PatchOp.ADD,
         path: `/packageData/${id}`,
         value: {
-          ...Mock.LocalPkgs[id],
+          ...Mock.LocalPkgs[id]!,
           stateInfo: {
             state: 'restoring',
             installingInfo: {
-              newManifest: Mock.LocalPkgs[id].stateInfo.manifest!,
+              newManifest: Mock.LocalPkgs[id]?.stateInfo.manifest!,
               progress: PROGRESS,
             },
           },
@@ -1640,7 +1640,7 @@ export class MockApiService extends ApiService {
       ) {
         await pauseFor(2000)
 
-        progress.phases[i].progress = true
+        progress.phases[i]!.progress = true
 
         if (
           progress.overall &&
@@ -1671,7 +1671,7 @@ export class MockApiService extends ApiService {
           if (phase.progress.done === phase.progress.total) {
             await pauseFor(250)
 
-            progress.phases[i].progress = true
+            progress.phases[i]!.progress = true
           }
         }
       }
@@ -1777,7 +1777,7 @@ export class MockApiService extends ApiService {
         path: `/packageData/${id}/stateInfo`,
         value: {
           state: 'installed',
-          manifest: Mock.LocalPkgs[id].stateInfo.manifest,
+          manifest: Mock.LocalPkgs[id]?.stateInfo.manifest!,
         },
       },
     ]
diff --git a/web/projects/ui/src/app/services/badge.service.ts b/web/projects/ui/src/app/services/badge.service.ts
index 2c3c05394..0efcb94ce 100644
--- a/web/projects/ui/src/app/services/badge.service.ts
+++ b/web/projects/ui/src/app/services/badge.service.ts
@@ -47,7 +47,8 @@ export class BadgeService {
 
             return (
               !curr[id] ||
-              (p.stateInfo.installingInfo && !curr[id].stateInfo.installingInfo)
+              (p.stateInfo.installingInfo &&
+                !curr[id]?.stateInfo.installingInfo)
             )
           }),
         ),
@@ -70,7 +71,7 @@ export class BadgeService {
                 local[id] &&
                 this.exver.compareExver(
                   version,
-                  getManifest(local[id]).version,
+                  getManifest(local[id]!).version,
                 ) === 1
                   ? result.add(id)
                   : result,
diff --git a/web/projects/ui/src/app/services/config.service.ts b/web/projects/ui/src/app/services/config.service.ts
index b4de3405f..4c38e8ff8 100644
--- a/web/projects/ui/src/app/services/config.service.ts
+++ b/web/projects/ui/src/app/services/config.service.ts
@@ -59,7 +59,7 @@ export class ConfigService {
           (this.hostname.startsWith('192.168.') ||
             this.hostname.startsWith('10.') ||
             (this.hostname.startsWith('172.') &&
-              !![this.hostname.split('.').map(Number)[1]].filter(
+              !![this.hostname.split('.').map(Number)[1] || NaN].filter(
                 n => n >= 16 && n < 32,
               ).length))
   }
@@ -107,13 +107,14 @@ export class ConfigService {
     if (!host) return ''
 
     let hostnameInfo = host.hostnameInfo[ui.addressInfo.internalPort]
-    hostnameInfo = hostnameInfo.filter(
-      h =>
-        this.isLocalhost() ||
-        h.kind !== 'ip' ||
-        h.hostname.kind !== 'ipv6' ||
-        !h.hostname.value.startsWith('fe80::'),
-    )
+    hostnameInfo =
+      hostnameInfo?.filter(
+        h =>
+          this.isLocalhost() ||
+          h.kind !== 'ip' ||
+          h.hostname.kind !== 'ipv6' ||
+          !h.hostname.value.startsWith('fe80::'),
+      ) || []
     if (this.isLocalhost()) {
       const local = hostnameInfo.find(
         h => h.kind === 'ip' && h.hostname.kind === 'local',
diff --git a/web/projects/ui/src/app/services/controls.service.ts b/web/projects/ui/src/app/services/controls.service.ts
index 2a283aee3..54185ad27 100644
--- a/web/projects/ui/src/app/services/controls.service.ts
+++ b/web/projects/ui/src/app/services/controls.service.ts
@@ -2,9 +2,16 @@ import { inject, Injectable } from '@angular/core'
 import { ErrorService, LoadingService } from '@start9labs/shared'
 import { T } from '@start9labs/start-sdk'
 import { TuiDialogOptions, TuiDialogService } from '@taiga-ui/core'
-import { TuiConfirmData, TUI_CONFIRM } from '@taiga-ui/kit'
+import { TUI_CONFIRM, TuiConfirmData } from '@taiga-ui/kit'
 import { PatchDB } from 'patch-db-client'
-import { defaultIfEmpty, filter, firstValueFrom } from 'rxjs'
+import {
+  defaultIfEmpty,
+  defer,
+  filter,
+  firstValueFrom,
+  of,
+  switchMap,
+} from 'rxjs'
 import { ApiService } from 'src/app/services/api/embassy-api.service'
 import { DataModel } from 'src/app/services/patch-db/data-model'
 import { getAllPackages } from 'src/app/utils/get-package-data'
@@ -20,53 +27,16 @@ export class ControlsService {
   private readonly api = inject(ApiService)
   private readonly patch = inject<PatchDB<DataModel>>(PatchDB)
 
-  async start(manifest: T.Manifest, unmet: boolean): Promise<void> {
-    const deps = `${manifest.title} has unmet dependencies. It will not work as expected.`
+  async start({ title, alerts, id }: T.Manifest, unmet: boolean) {
+    const deps = `${title} has unmet dependencies. It will not work as expected.`
 
     if (
-      (!unmet || (await this.alert(deps))) &&
-      (!manifest.alerts.start || (await this.alert(manifest.alerts.start)))
+      (unmet && !(await this.alert(deps))) ||
+      (alerts.start && !(await this.alert(alerts.start)))
     ) {
-      this.doStart(manifest.id)
-    }
-  }
-
-  async stop({ id, title, alerts }: T.Manifest): Promise<void> {
-    let content = alerts.stop || ''
-
-    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
-      const depMessage = `Services that depend on ${title} will no longer work properly and may crash`
-      content = content ? `${content}.\n\n${depMessage}` : depMessage
+      return
     }
 
-    if (content) {
-      this.dialogs
-        .open(TUI_CONFIRM, getOptions(content, 'Stop'))
-        .pipe(filter(Boolean))
-        .subscribe(() => this.doStop(id))
-    } else {
-      this.doStop(id)
-    }
-  }
-
-  async restart({ id, title }: T.Manifest): Promise<void> {
-    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
-      this.dialogs
-        .open(
-          TUI_CONFIRM,
-          getOptions(
-            `Services that depend on ${title} may temporarily experiences issues`,
-            'Restart',
-          ),
-        )
-        .pipe(filter(Boolean))
-        .subscribe(() => this.doRestart(id))
-    } else {
-      this.doRestart(id)
-    }
-  }
-
-  private async doStart(id: string): Promise<void> {
     const loader = this.loader.open(`Starting...`).subscribe()
 
     try {
@@ -78,28 +48,55 @@ export class ControlsService {
     }
   }
 
-  private async doStop(id: string): Promise<void> {
-    const loader = this.loader.open(`Stopping...`).subscribe()
+  async stop({ id, title, alerts }: T.Manifest) {
+    const depMessage = `Services that depend on ${title} will no longer work properly and may crash`
+    let content = alerts.stop || ''
 
-    try {
-      await this.api.stopPackage({ id })
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      loader.unsubscribe()
+    if (hasCurrentDeps(id, await getAllPackages(this.patch))) {
+      content = content ? `${content}.\n\n${depMessage}` : depMessage
     }
+
+    defer(() =>
+      content
+        ? this.dialogs
+            .open(TUI_CONFIRM, getOptions(content, 'Stop'))
+            .pipe(filter(Boolean))
+        : of(null),
+    ).subscribe(async () => {
+      const loader = this.loader.open(`Stopping...`).subscribe()
+
+      try {
+        await this.api.stopPackage({ id })
+      } catch (e: any) {
+        this.errorService.handleError(e)
+      } finally {
+        loader.unsubscribe()
+      }
+    })
   }
 
-  private async doRestart(id: string): Promise<void> {
-    const loader = this.loader.open(`Restarting...`).subscribe()
+  async restart({ id, title }: T.Manifest) {
+    const packages = await getAllPackages(this.patch)
+    const options = getOptions(
+      `Services that depend on ${title} may temporarily experiences issues`,
+      'Restart',
+    )
 
-    try {
-      await this.api.restartPackage({ id })
-    } catch (e: any) {
-      this.errorService.handleError(e)
-    } finally {
-      loader.unsubscribe()
-    }
+    defer(() =>
+      hasCurrentDeps(id, packages)
+        ? this.dialogs.open(TUI_CONFIRM, options).pipe(filter(Boolean))
+        : of(null),
+    ).subscribe(async () => {
+      const loader = this.loader.open(`Restarting...`).subscribe()
+
+      try {
+        await this.api.restartPackage({ id })
+      } catch (e: any) {
+        this.errorService.handleError(e)
+      } finally {
+        loader.unsubscribe()
+      }
+    })
   }
 
   private alert(content: string): Promise<boolean> {
diff --git a/web/projects/ui/src/app/services/dep-error.service.ts b/web/projects/ui/src/app/services/dep-error.service.ts
index 0fbc6a9b7..dcaf5e429 100644
--- a/web/projects/ui/src/app/services/dep-error.service.ts
+++ b/web/projects/ui/src/app/services/dep-error.service.ts
@@ -60,7 +60,7 @@ export class DepErrorService {
   ): PkgDependencyErrors {
     const pkg = pkgs[pkgId]
 
-    if (!isInstalled(pkg)) return {}
+    if (!pkg || !isInstalled(pkg)) return {}
 
     return currentDeps(pkgs, pkgId).reduce(
       (innerErrors, depId): PkgDependencyErrors => ({
@@ -88,17 +88,14 @@ export class DepErrorService {
 
     const currentDep = pkg.currentDependencies[depId]
     const depManifest = dep.stateInfo.manifest
+    const expected = currentDep?.versionRange || ''
 
     // incorrect version
-    if (!this.exver.satisfies(depManifest.version, currentDep.versionRange)) {
-      if (
-        depManifest.satisfies.some(
-          v => !this.exver.satisfies(v, currentDep.versionRange),
-        )
-      ) {
+    if (!this.exver.satisfies(depManifest.version, expected)) {
+      if (depManifest.satisfies.some(v => !this.exver.satisfies(v, expected))) {
         return {
+          expected,
           type: 'incorrectVersion',
-          expected: currentDep.versionRange,
           received: depManifest.version,
         }
       }
@@ -128,10 +125,10 @@ export class DepErrorService {
     }
 
     // health check failure
-    if (depStatus === 'running' && currentDep.kind === 'running') {
+    if (depStatus === 'running' && currentDep?.kind === 'running') {
       for (let id of currentDep.healthChecks) {
         const check = dep.status.health[id]
-        if (check?.result !== 'success') {
+        if (check && check?.result !== 'success') {
           return {
             type: 'healthChecksFailed',
             check,
@@ -142,7 +139,7 @@ export class DepErrorService {
 
     // transitive
     const transitiveError = currentDeps(pkgs, depId).some(transitiveId =>
-      Object.values(outerErrors[transitiveId]).some(err => !!err),
+      Object.values(outerErrors[transitiveId] || {}).some(err => !!err),
     )
 
     if (transitiveError) {
diff --git a/web/projects/ui/src/app/services/form.service.ts b/web/projects/ui/src/app/services/form.service.ts
index e524fc9c4..1b1457c26 100644
--- a/web/projects/ui/src/app/services/form.service.ts
+++ b/web/projects/ui/src/app/services/form.service.ts
@@ -42,9 +42,12 @@ export class FormService {
     const selected = valid ? value?.selection : spec.default
     const selection = this.getUnionSelectSpec(spec, selected)
     const group = this.getFormGroup({ selection })
-    const control = selected ? spec.variants[selected].spec : {}
+    const control = selected ? spec.variants[selected]?.spec : {}
 
-    group.setControl('value', this.getFormGroup(control, [], value?.value))
+    group.setControl(
+      'value',
+      this.getFormGroup(control || {}, [], value?.value),
+    )
 
     return group
   }
@@ -410,7 +413,12 @@ function listObjEquals(
   if (!uniqueBy) {
     return false
   } else if (typeof uniqueBy === 'string') {
-    return uniqueByEquals(spec.spec[uniqueBy], val1[uniqueBy], val2[uniqueBy])
+    const uniqueBySpec = spec.spec[uniqueBy]
+
+    return (
+      !!uniqueBySpec &&
+      uniqueByEquals(uniqueBySpec, val1[uniqueBy], val2[uniqueBy])
+    )
   } else if ('any' in uniqueBy) {
     for (let unique of uniqueBy.any) {
       if (listObjEquals(unique, spec, val1, val2)) {
@@ -522,8 +530,12 @@ export function convertValuesRecursive(
       convertValuesRecursive(valueSpec.spec, group.get(key) as UntypedFormGroup)
     } else if (valueSpec.type === 'union') {
       const formGr = group.get(key) as UntypedFormGroup
-      const spec = valueSpec.variants[formGr.controls['selection'].value].spec
-      convertValuesRecursive(spec, formGr)
+      const value = formGr.controls['selection']?.value
+      const spec = !!value && valueSpec.variants[value]?.spec
+
+      if (spec) {
+        convertValuesRecursive(spec, formGr)
+      }
     } else if (valueSpec.type === 'list') {
       const formArr = group.get(key) as UntypedFormArray
       const { controls } = formArr
diff --git a/web/projects/ui/src/app/services/marketplace.service.ts b/web/projects/ui/src/app/services/marketplace.service.ts
index b6697b7c5..cbba2d55e 100644
--- a/web/projects/ui/src/app/services/marketplace.service.ts
+++ b/web/projects/ui/src/app/services/marketplace.service.ts
@@ -249,20 +249,23 @@ export class MarketplaceService {
     flavor: string | null,
     pkgInfo: GetPackageRes,
   ): MarketplacePkg {
-    version =
+    const ver =
       version ||
       Object.keys(pkgInfo.best).find(v => this.exver.getFlavor(v) === flavor) ||
       null
+    const best = ver && pkgInfo.best[ver]
 
-    return !version || !pkgInfo.best[version]
-      ? ({} as MarketplacePkg)
-      : {
-          id,
-          version,
-          flavor,
-          ...pkgInfo,
-          ...pkgInfo.best[version],
-        }
+    if (!best) {
+      return {} as MarketplacePkg
+    }
+
+    return {
+      id,
+      flavor,
+      version: ver || '',
+      ...pkgInfo,
+      ...best,
+    }
   }
 
   getRequestErrors$(): Observable<string[]> {
diff --git a/web/projects/ui/src/app/utils/acme.ts b/web/projects/ui/src/app/utils/acme.ts
index 516472e11..c3a2dee4b 100644
--- a/web/projects/ui/src/app/utils/acme.ts
+++ b/web/projects/ui/src/app/utils/acme.ts
@@ -6,10 +6,7 @@ export function toAcmeUrl(name: string): string {
   return knownACME.find(acme => acme.name === name)?.url || name
 }
 
-export const knownACME: {
-  name: string
-  url: string
-}[] = [
+export const knownACME = [
   {
     name: `Let's Encrypt`,
     url: 'https://acme-v02.api.letsencrypt.org/directory',
@@ -18,4 +15,4 @@ export const knownACME: {
     name: `Let's Encrypt (Staging)`,
     url: 'https://acme-staging-v02.api.letsencrypt.org/directory',
   },
-]
+] as const
diff --git a/web/projects/ui/src/app/utils/dry-update.ts b/web/projects/ui/src/app/utils/dry-update.ts
index e9386df3c..2a71c20d4 100644
--- a/web/projects/ui/src/app/utils/dry-update.ts
+++ b/web/projects/ui/src/app/utils/dry-update.ts
@@ -13,7 +13,10 @@ export function dryUpdate(
         Object.keys(pkg.currentDependencies || {}).some(
           pkgId => pkgId === id,
         ) &&
-        !exver.satisfies(version, pkg.currentDependencies[id].versionRange),
+        !exver.satisfies(
+          version,
+          pkg.currentDependencies[id]?.versionRange || '',
+        ),
     )
     .map(pkg => getManifest(pkg).title)
 }
diff --git a/web/projects/ui/src/app/utils/system-utilities.ts b/web/projects/ui/src/app/utils/system-utilities.ts
index ea62da33b..cb90c48cc 100644
--- a/web/projects/ui/src/app/utils/system-utilities.ts
+++ b/web/projects/ui/src/app/utils/system-utilities.ts
@@ -47,8 +47,8 @@ export function getMenu() {
   const badge = inject(BadgeService)
 
   return Object.keys(SYSTEM_UTILITIES).map(key => ({
-    name: SYSTEM_UTILITIES[key].title,
-    icon: SYSTEM_UTILITIES[key].icon,
+    name: SYSTEM_UTILITIES[key]?.title || '',
+    icon: SYSTEM_UTILITIES[key]?.icon || '',
     routerLink: key,
     badge: toSignal(badge.getCount(key), { initialValue: 0 }),
   }))
diff --git a/web/projects/ui/src/styles.scss b/web/projects/ui/src/styles.scss
index 3ab4c9db8..e54fc95ed 100644
--- a/web/projects/ui/src/styles.scss
+++ b/web/projects/ui/src/styles.scss
@@ -69,7 +69,6 @@ hr {
   min-height: fit-content;
   flex: 1;
   padding: 1rem;
-  overflow: hidden;
 }
 
 .g-aside {
diff --git a/web/tsconfig.json b/web/tsconfig.json
index 5f10deca8..49bbd1912 100644
--- a/web/tsconfig.json
+++ b/web/tsconfig.json
@@ -8,6 +8,7 @@
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
     "noFallthroughCasesInSwitch": true,
+    "noUncheckedIndexedAccess": true,
     "skipLibCheck": true,
     "strict": true,
     "sourceMap": true,