diff --git a/src/app/modules/inventory-detail/detail/header.component.ts b/src/app/modules/inventory-detail/detail/header.component.ts
index ff0205ad..10faa945 100644
--- a/src/app/modules/inventory-detail/detail/header.component.ts
+++ b/src/app/modules/inventory-detail/detail/header.component.ts
@@ -5,6 +5,7 @@ import { MatDialog } from '@angular/material/dialog'
 import { type MatSelect } from '@angular/material/select'
 import { AgGridAngular } from 'ag-grid-angular'
 import type { ColDef, GridApi, GridReadyEvent } from 'ag-grid-community'
+import { filter, take, tap } from 'rxjs'
 import type { AccessLevelInstance, Label, Organization } from '@seed/api'
 import { LabelComponent } from '@seed/components'
 import { MaterialImports } from '@seed/materials'
@@ -208,9 +209,13 @@ export class HeaderComponent implements OnInit {
       },
     })
 
-    dialogRef.afterClosed().subscribe((message) => {
-      if (message === 'refresh') this.refreshDetail.emit()
-    })
+    dialogRef.afterClosed()
+      .pipe(
+        take(1),
+        filter(Boolean),
+        tap(() => { this.refreshDetail.emit() }),
+      )
+      .subscribe()
   }
 
   trackByFn(_index: number, { id }: AccessLevelInstance) {
diff --git a/src/app/modules/inventory-list/list/grid/cell-header-menu.component.html b/src/app/modules/inventory-list/list/grid/cell-header-menu.component.html
index 90385dd6..3000a815 100644
--- a/src/app/modules/inventory-list/list/grid/cell-header-menu.component.html
+++ b/src/app/modules/inventory-list/list/grid/cell-header-menu.component.html
@@ -1,10 +1,57 @@
-<div class="flex justify-between gap-4 overflow-hidden">
-  <span class="my-auto">{{ params.displayName }}</span>
-  <mat-icon class="scale-50 cursor-pointer" (click)="toggleMenu($event)" svgIcon="fa-solid:chevron-down"></mat-icon>
+<!-- TRIGGER -->
+<div class="flex w-full justify-between gap-4 overflow-hidden" #trigger>
+  <div class="flex gap-4">
+    <span class="my-auto">{{ params.displayName }}</span>
+    @if (sortIcon) {
+      <mat-icon class="scale-50" [svgIcon]="sortIcon"></mat-icon>
+    }
+  </div>
+  <div class="cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-gray-800" (click)="toggleMenu()">
+    <mat-icon class="scale-50" svgIcon="fa-solid:ellipsis-vertical"></mat-icon>
+  </div>
 </div>
-<!-- THIS IS IN DEVELOPMENT -->
-@if (menuVisible) {
-  <div class="cell-menu absolute z-[1000] w-48 rounded-md border border-gray-300 bg-white p-2 shadow-lg">
-    <button (click)="sortAsc()">Sort Asc</button>
+
+<!-- MENU -->
+<ng-template #menu>
+  <div class="w-80 rounded border p-2 text-sm" [class.bg-[#2A3341]]="scheme === 'dark'" [class.bg-white]="scheme === 'light'">
+    <div class="menu-option" (click)="sortCol('asc')">
+      <mat-icon class="scale-50" svgIcon="fa-solid:arrow-up"></mat-icon>
+      <span>Sort Ascending</span>
+    </div>
+
+    <div class="menu-option" (click)="sortCol('desc')">
+      <mat-icon class="scale-50" svgIcon="fa-solid:arrow-down"></mat-icon>
+      <span>Sort Descending</span>
+    </div>
+
+    @if (sortIcon) {
+      <div class="menu-option" (click)="sortCol(null)">
+        <mat-icon class="scale-50" svgIcon="fa-solid:minus"></mat-icon>
+        <span>Clear Sort</span>
+      </div>
+    }
+
+    <mat-divider></mat-divider>
+
+    <div class="menu-option" (click)="pinCol('left')">
+      <mat-icon class="scale-50" [svgIcon]="'fa-solid:thumbtack'"></mat-icon>
+      <span>Pin Left</span>
+    </div>
+    <div class="menu-option" (click)="pinCol('right')">
+      <mat-icon class="scale-50" svgIcon="fa-solid:thumbtack"></mat-icon>
+      <span>Pin right</span>
+    </div>
+    @if (pinState) {
+      <div class="menu-option" (click)="pinCol(null)">
+        <mat-icon class="scale-50" svgIcon="fa-solid:minus"></mat-icon>
+        <span>Unpin</span>
+      </div>
+    }
+
+    <mat-divider></mat-divider>
+    <div class="menu-option" (click)="hideCol()">
+      <mat-icon class="scale-50" svgIcon="fa-solid:eye-slash"></mat-icon>
+      <span>Hide Column</span>
+    </div>
   </div>
-}
+</ng-template>
diff --git a/src/app/modules/inventory-list/list/grid/cell-header-menu.component.ts b/src/app/modules/inventory-list/list/grid/cell-header-menu.component.ts
index f949b18c..53d3dede 100644
--- a/src/app/modules/inventory-list/list/grid/cell-header-menu.component.ts
+++ b/src/app/modules/inventory-list/list/grid/cell-header-menu.component.ts
@@ -1,30 +1,149 @@
-import { Component } from '@angular/core'
+import type { FlexibleConnectedPositionStrategyOrigin, OverlayRef } from '@angular/cdk/overlay'
+import { Overlay } from '@angular/cdk/overlay'
+import { TemplatePortal } from '@angular/cdk/portal'
+import { CommonModule } from '@angular/common'
+import type { AfterViewInit, TemplateRef } from '@angular/core'
+import { Component, inject, ViewChild, ViewContainerRef } from '@angular/core'
 import type { IHeaderAngularComp } from 'ag-grid-angular'
-import type { IHeaderParams } from 'ag-grid-community'
+import type { Column, GridApi, IHeaderParams } from 'ag-grid-community'
+import { take } from 'rxjs'
+import type { CurrentUser, OrganizationUserSettings } from '@seed/api'
+import { OrganizationService } from '@seed/api'
 import { MaterialImports } from '@seed/materials'
+import { ConfigService } from '@seed/services'
+import type { InventoryType } from 'app/modules/inventory/inventory.types'
 
 @Component({
   selector: 'seed-inventory-grid-cell-header-menu',
   templateUrl: './cell-header-menu.component.html',
-  imports: [MaterialImports],
+  imports: [CommonModule, MaterialImports],
 })
-export class CellHeaderMenuComponent implements IHeaderAngularComp {
-  // THIS COMPONENT IS STILL IN DEVELOPMENT
-  public params: IHeaderParams
-  public menuVisible = false
+export class CellHeaderMenuComponent implements IHeaderAngularComp, AfterViewInit {
+  @ViewChild('menu') menuTemplate!: TemplateRef<unknown>
+  @ViewChild('trigger') trigger!: FlexibleConnectedPositionStrategyOrigin
 
-  agInit(params: IHeaderParams): void {
+  private _configService = inject(ConfigService)
+  private _organizationService = inject(OrganizationService)
+  private _overlay = inject(Overlay)
+  private _vcr = inject(ViewContainerRef)
+  column: Column<unknown>
+  gridApi: GridApi
+  opened = false
+  orgId: number
+  orgUserId: number
+  overlayRef: OverlayRef
+  params: IHeaderParams
+  pinState: unknown
+  scheme: 'dark' | 'light'
+  sortIcon = ''
+  type: InventoryType
+  userSettings: OrganizationUserSettings
+
+  agInit(params: IHeaderParams & { currentUser: CurrentUser; type: InventoryType }): void {
     this.params = params
+    this.column = params.column
+    this.gridApi = params.api
+    this.type = params.type
+    const { org_id, org_user_id, settings } = params.currentUser
+    this.orgId = org_id
+    this.orgUserId = org_user_id
+    this.userSettings = settings
+  }
+
+  ngAfterViewInit(): void {
+    this.getScheme()
+    this.setOverlay()
+    this.updateSortState()
+    this.column.addEventListener('sortChanged', () => {
+      this.updateSortState()
+    })
+    this.gridApi.addEventListener('columnPinned', () => {
+      this.pinState = this.column.isPinned()
+    })
+  }
+
+  getScheme() {
+    this._configService.scheme$.subscribe((scheme) => {
+      this.scheme = scheme
+    })
+  }
+
+  updateSortState() {
+    const state = this.gridApi.getColumnState().find((col) => col.colId === this.params.column.getColId())
+    const sortDir = state?.sort ?? null
+    const iconMap = {
+      asc: 'fa-solid:arrow-up',
+      desc: 'fa-solid:arrow-down',
+    }
+    this.sortIcon = iconMap[sortDir] ?? ''
+  }
+
+  setOverlay() {
+    const positionStrategy = this._overlay
+      .position()
+      .flexibleConnectedTo(this.trigger)
+      .withPositions([
+        {
+          originX: 'end',
+          originY: 'bottom',
+          overlayX: 'start',
+          overlayY: 'top',
+        },
+      ])
+
+    this.overlayRef = this._overlay.create({
+      positionStrategy,
+      hasBackdrop: true,
+      backdropClass: 'transparent-backdrop',
+    })
+
+    this.overlayRef.backdropClick().subscribe(() => {
+      this.overlayRef.detach()
+    })
+  }
+
+  toggleMenu(): void {
+    // event.stopPropagation()
+    // this.menuVisible = !this.menuVisible
+    if (this.overlayRef?.hasAttached()) {
+      this.overlayRef.detach()
+    } else {
+      const portal = new TemplatePortal(this.menuTemplate, this._vcr)
+      this.overlayRef?.attach(portal)
+    }
+  }
+
+  sortCol(direction: 'asc' | 'desc' | null): void {
+    this.gridApi.applyColumnState({
+      state: [{ colId: this.params.column.getColId(), sort: direction }],
+      defaultState: { sort: null },
+    })
+    const dir = direction === 'desc' ? '-' : ''
+    const colDef = this.column.getColDef()
+    const sort = `${dir}${colDef.field}`
+    this.userSettings.sorts?.[this.type].push(sort)
+
+    this.detach()
+  }
+
+  pinCol(direction: 'left' | 'right' | null): void {
+    this.gridApi.setColumnsPinned([this.column], direction)
+    this.detach()
+  }
+
+  hideCol() {
+    this.gridApi.setColumnsVisible([this.column], false)
+    this.detach()
   }
 
-  toggleMenu(event: MouseEvent): void {
-    event.stopPropagation()
-    this.menuVisible = !this.menuVisible
+  updateOrgUserSettings() {
+    return this._organizationService.updateOrganizationUser(this.orgUserId, this.orgId, this.userSettings)
+      .pipe(take(1))
+      .subscribe()
   }
 
-  sortAsc(): void {
-    console.log('sort asc')
-    this.menuVisible = false
+  detach() {
+    this.overlayRef.detach()
   }
 
   refresh() {
diff --git a/src/app/modules/inventory-list/list/grid/filter-sort-chips.component.ts b/src/app/modules/inventory-list/list/grid/filter-sort-chips.component.ts
index 24639b5d..f09128b0 100644
--- a/src/app/modules/inventory-list/list/grid/filter-sort-chips.component.ts
+++ b/src/app/modules/inventory-list/list/grid/filter-sort-chips.component.ts
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common'
 import type { OnChanges, SimpleChanges } from '@angular/core'
 import { Component, Input } from '@angular/core'
 import type { ColDef, GridApi } from 'ag-grid-community'
-import type { OrganizationUserSettings } from '@seed/api'
+import type { Column, OrganizationUserSettings } from '@seed/api'
 import { MaterialImports } from '@seed/materials'
 import type { AgFilter, FilterSortChip, FilterType, InventoryType } from '../../../inventory/inventory.types'
 
@@ -12,15 +12,17 @@ import type { AgFilter, FilterSortChip, FilterType, InventoryType } from '../../
   imports: [CommonModule, MaterialImports],
 })
 export class FilterSortChipsComponent implements OnChanges {
-  @Input() gridApi: GridApi
+  @Input() columns: Column[]
   @Input() columnDefs: ColDef[]
+  @Input() gridApi: GridApi
   @Input() userSettings: OrganizationUserSettings
   @Input() type: InventoryType
   filterChips: FilterSortChip[] = []
   sortChips: FilterSortChip[] = []
 
-  ngOnChanges({ userSettings }: SimpleChanges) {
-    if (userSettings?.currentValue) {
+  ngOnChanges(changes: SimpleChanges) {
+    const { userSettings, columnDefs } = changes
+    if (userSettings?.currentValue || columnDefs?.currentValue) {
       this.getFilterChips()
       this.getSortChips()
     }
@@ -38,12 +40,20 @@ export class FilterSortChipsComponent implements OnChanges {
     this.filterChips = []
     for (const columnName of Object.keys(this.filters)) {
       const colDef = this.columnDefs.find(({ field }) => field === columnName)
-
-      if (!colDef) return
-
-      const displayName = this.buildFilterDisplayName(colDef, this.filters[columnName])
-      const chip = { field: colDef.field, displayName, original: columnName }
-      this.filterChips.push(chip)
+      if (colDef) {
+        this.filterChips.push({
+          field: colDef.field,
+          displayName: this.buildFilterDisplayName(colDef, this.filters[columnName]),
+          original: columnName,
+        })
+      } else {
+        const column = this.columns.find((c) => c.name === columnName)
+        this.filterChips.push({
+          field: columnName,
+          displayName: column?.display_name ?? columnName,
+          original: columnName,
+        })
+      }
     }
   }
 
@@ -53,11 +63,21 @@ export class FilterSortChipsComponent implements OnChanges {
       const direction = sort.startsWith('-') ? 'desc' : 'asc'
       sort = sort.replace(/^-/, '')
       const colDef = this.columnDefs.find(({ field }) => field === sort)
-
-      if (!colDef) return
-
-      const chip = { field: colDef.field, displayName: `${colDef.headerName} ${direction}`, original: sort }
-      this.sortChips.push(chip)
+      if (colDef) {
+        this.sortChips.push({
+          field: colDef.field,
+          displayName: `${colDef.headerName} ${direction}`,
+          original: sort,
+        })
+      } else {
+        const column = this.columns.find((c) => c.name === sort)
+        const displayName = column?.display_name ?? sort
+        this.sortChips.push({
+          field: sort,
+          displayName: `${displayName} ${direction}`,
+          original: sort,
+        })
+      }
     }
   }
 
diff --git a/src/app/modules/inventory-list/list/grid/grid-controls.component.html b/src/app/modules/inventory-list/list/grid/grid-controls.component.html
index c614ae05..341c23e2 100644
--- a/src/app/modules/inventory-list/list/grid/grid-controls.component.html
+++ b/src/app/modules/inventory-list/list/grid/grid-controls.component.html
@@ -1,5 +1,49 @@
 <div class="mx-2 flex justify-between">
   <mat-icon class="scale-75 cursor-pointer" (click)="resetGrid()" svgIcon="fa-solid:arrows-rotate" matTooltip="Reset Grid"></mat-icon>
+
+  <!--  POTENTIAL RESET MENU FOR MORE CONTROL -->
+
+  <!-- <mat-icon
+    class="scale-75 cursor-pointer"
+    [matMenuTriggerFor]="menu"
+    svgIcon="fa-solid:arrows-rotate"
+    matTooltip="Reset Grid Menu"
+  ></mat-icon> -->
+
+  <!-- <mat-menu #menu="matMenu">
+    <div class="px-0">
+      @if (gridApi) {
+        <div class="menu-option" [ngClass]="{ '': scheme === 'dark' }" (click)="resetGrid()">
+          <mat-icon class="scale-50" svgIcon="fa-solid:rotate"></mat-icon>
+          <span class="w-200">Reset Grid</span>
+        </div>
+        <mat-divider class="mx-3 my-1"></mat-divider>
+
+        <div class="menu-option"
+          [ngClass]="{'': scheme === 'dark'}" (click)="resetColumns()">
+          <div class="w-6"></div>
+          <span>Reset Columns</span>
+        </div>
+        <div class="menu-option"
+          [ngClass]="{'': scheme === 'dark'}" (click)="resetFilters()">
+          <div class="w-6"></div>
+          <span>Reset Filters</span>
+        </div>
+        <div class="menu-option"
+          [ngClass]="{'': scheme === 'dark'}" (click)="resetSorts()">
+          <div class="w-6"></div>
+          <span>Reset Sorts</span>
+        </div>
+        <mat-divider class="mx-3 my-1"></mat-divider>
+      }
+
+      <div class="menu-option" [ngClass]="{ '': scheme === 'dark' }" (click)="resetUserSettings()">
+        <div class="w-6"></div>
+        <span>Reset User Settings</span>
+      </div>
+    </div>
+  </mat-menu> -->
+
   <div class="my-auto flex justify-end">
     @if (selectedViewIds.length > 0) {
       <span class="my-auto mr-10">({{ selectedViewIds.length }} selected)</span>
diff --git a/src/app/modules/inventory-list/list/grid/grid-controls.component.ts b/src/app/modules/inventory-list/list/grid/grid-controls.component.ts
index dbf98659..729de61b 100644
--- a/src/app/modules/inventory-list/list/grid/grid-controls.component.ts
+++ b/src/app/modules/inventory-list/list/grid/grid-controls.component.ts
@@ -1,17 +1,41 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import type { OnChanges, OnInit, SimpleChanges } from '@angular/core'
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core'
+import type { GridApi } from 'ag-grid-community'
+import { take, tap } from 'rxjs'
+import type { CurrentUser, OrganizationUserSettings } from '@seed/api'
+import { OrganizationService } from '@seed/api'
 import { MaterialImports } from '@seed/materials'
-import type { Pagination } from 'app/modules/inventory'
+import { ConfigService } from '@seed/services'
+import type { Pagination } from '../../../inventory/inventory.types'
 
 @Component({
   selector: 'seed-inventory-grid-controls',
   templateUrl: './grid-controls.component.html',
-  imports: [MaterialImports],
+  imports: [CommonModule, MaterialImports],
 })
-export class InventoryGridControlsComponent {
+export class InventoryGridControlsComponent implements OnChanges, OnInit {
+  @Input() currentUser!: CurrentUser
+  @Input() gridApi: GridApi
   @Input() pagination!: Pagination
-  @Input() resetGrid: () => void
   @Input() selectedViewIds: number[]
   @Output() pageChange = new EventEmitter<number>()
+  private _configService = inject(ConfigService)
+  private _organizationService = inject(OrganizationService)
+  scheme: 'dark' | 'light'
+  userSettings: OrganizationUserSettings
+
+  ngOnInit(): void {
+    this._configService.scheme$.subscribe((scheme) => {
+      this.scheme = scheme
+    })
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.currentUser?.currentValue) {
+      this.userSettings = this.currentUser.settings
+    }
+  }
 
   onPageChange = (direction: 'first' | 'previous' | 'next' | 'last') => {
     const { page, num_pages } = this.pagination
@@ -22,4 +46,45 @@ export class InventoryGridControlsComponent {
 
     this.pageChange.emit(newPage)
   }
+
+  resetGrid() {
+    this.resetColumns()
+    this.resetFilters()
+    this.resetSorts()
+  }
+
+  resetColumns() {
+    this.gridApi.autoSizeAllColumns()
+  }
+
+  resetFilters() {
+    this.gridApi.setFilterModel(null)
+    this.userSettings.filters = this.currentUser.settings.filters ?? {}
+    this.userSettings.filters.properties = {}
+    this.userSettings.filters.taxlots = {}
+    this.updateOrgUser()
+  }
+
+  resetSorts() {
+    this.gridApi.applyColumnState({ state: [], applyOrder: true })
+    this.gridApi.resetColumnState()
+    this.userSettings.sorts = this.currentUser.settings?.sorts ?? {}
+    this.userSettings.sorts.properties = []
+    this.userSettings.sorts.taxlots = []
+    this.updateOrgUser()
+  }
+
+  updateOrgUser() {
+    const { org_id, org_user_id } = this.currentUser
+    this._organizationService.updateOrganizationUser(org_user_id, org_id, this.userSettings)
+      .pipe(
+        take(1),
+        tap(() => {
+          this.gridApi.refreshClientSideRowModel()
+          this.gridApi.refreshCells({ force: true })
+          this.gridApi.onSortChanged()
+        }),
+      )
+      .subscribe()
+  }
 }
diff --git a/src/app/modules/inventory-list/list/grid/grid.component.html b/src/app/modules/inventory-list/list/grid/grid.component.html
index 69a8adad..8fbe0557 100644
--- a/src/app/modules/inventory-list/list/grid/grid.component.html
+++ b/src/app/modules/inventory-list/list/grid/grid.component.html
@@ -1,6 +1,7 @@
 <seed-inventory-grid-controls
+  [currentUser]="currentUser"
+  [gridApi]="gridApi"
   [pagination]="pagination"
-  [resetGrid]="resetGrid"
   [selectedViewIds]="selectedViewIds"
   (pageChange)="onPageChange($event)"
 >
diff --git a/src/app/modules/inventory-list/list/grid/grid.component.ts b/src/app/modules/inventory-list/list/grid/grid.component.ts
index c4675347..e119b380 100644
--- a/src/app/modules/inventory-list/list/grid/grid.component.ts
+++ b/src/app/modules/inventory-list/list/grid/grid.component.ts
@@ -4,9 +4,11 @@ import { Component, EventEmitter, inject, Input, Output } from '@angular/core'
 import { Router } from '@angular/router'
 import { AgGridAngular } from 'ag-grid-angular'
 import type { CellClickedEvent, ColDef, ColGroupDef, GridApi, GridOptions, GridReadyEvent } from 'ag-grid-community'
-import type { Label } from '@seed/api'
+import type { CurrentUser, Label, OrganizationUserSettings } from '@seed/api'
+import { OrganizationService } from '@seed/api'
 import { ConfigService } from '@seed/services'
-import type { FiltersSorts, InventoryType, Pagination } from 'app/modules/inventory'
+import type { FiltersSorts, InventoryType, Pagination } from '../../../inventory/inventory.types'
+import { CellHeaderMenuComponent } from './cell-header-menu.component'
 import { InventoryGridControlsComponent } from './grid-controls.component'
 
 @Component({
@@ -14,25 +16,30 @@ import { InventoryGridControlsComponent } from './grid-controls.component'
   templateUrl: './grid.component.html',
   imports: [
     AgGridAngular,
-    // CellHeaderMenuComponent,
+    CellHeaderMenuComponent,
     CommonModule,
     InventoryGridControlsComponent,
   ],
 })
 export class InventoryGridComponent implements OnChanges {
   @Input() columnDefs!: ColDef[]
+  @Input() currentUser: CurrentUser
   @Input() inventoryType: string
   @Input() labelMap: Record<number, Label>
+  @Input() orgId: number
+  @Input() orgUserId: number
   @Input() pagination!: Pagination
   @Input() rowData!: Record<string, unknown>[]
   @Input() selectedViewIds: number[]
   @Input() type: InventoryType
+  @Input() userSettings: OrganizationUserSettings
   @Output() pageChange = new EventEmitter<number>()
   @Output() filterSortChange = new EventEmitter<FiltersSorts>()
   @Output() gridReady = new EventEmitter<GridApi>()
   @Output() selectionChanged = new EventEmitter<null>()
   @Output() gridReset = new EventEmitter<null>()
   private _configService = inject(ConfigService)
+  private _organizationService = inject(OrganizationService)
   private _router = inject(Router)
 
   agPageSize = 100
@@ -74,6 +81,7 @@ export class InventoryGridComponent implements OnChanges {
   onGridReady(params: GridReadyEvent) {
     this.gridApi = params.api
     this.gridReady.emit(this.gridApi)
+    this.gridApi.autoSizeAllColumns()
     this.gridApi.addEventListener('cellClicked', this.onCellClicked.bind(this) as (event: CellClickedEvent) => void)
   }
 
@@ -101,31 +109,48 @@ export class InventoryGridComponent implements OnChanges {
   }
 
   getColumnDefs() {
+    const stateColumns = this.addHeaderMenu()
+
     this.columnDefs = [
       { headerName: 'Shortcuts', children: this.getShortcutColumns() } as ColGroupDef,
-      { headerName: 'Details', children: this.columnDefs } as ColGroupDef,
+      { headerName: 'Details', children: stateColumns } as ColGroupDef,
     ]
   }
 
   getShortcutColumns(): ColDef[] {
     const shortcutColumns = [
       this.buildInfoCell(),
-      this.buildShortcutColumn('merged_indicator', 'Merged', 85, 'share'),
-      this.buildShortcutColumn('meters_exist_indicator', 'Meters', 80, 'bolt', 'meters'),
-      this.buildShortcutColumn('notes_count', 'Notes', 80, 'mode_comment', 'notes'),
-      this.buildShortcutColumn('groups_indicator', 'Groups', 80, 'G'),
+      this.buildShortcutColumn('merged_indicator', 'Merged', 82, 'share'),
+      this.buildShortcutColumn('meters_exist_indicator', 'Meters', 78, 'bolt', 'meters'),
+      this.buildShortcutColumn('notes_count', 'Notes', 71, 'mode_comment', 'notes'),
+      this.buildShortcutColumn('groups_indicator', 'Groups', 79, 'G'),
       this.buildLabelsCell(),
     ]
     return shortcutColumns
   }
 
-  buildShortcutColumn(field: string, headerName: string, width: number, icon: string, action: string = null): ColDef {
+  addHeaderMenu() {
+    const stateColumns = this.columnDefs.map((c) => ({
+      ...c,
+      headerComponent: CellHeaderMenuComponent,
+      headerComponentParams: {
+        currentUser: this.currentUser,
+        type: this.type,
+      },
+    }))
+    return stateColumns
+  }
+
+  buildShortcutColumn(field: string, headerName: string, maxWidth: number, icon: string, action: string = null): ColDef {
     return {
       field,
       headerName,
-      width,
+      maxWidth,
       filter: false,
       sortable: false,
+      suppressMovable: true,
+      headerClass: 'white-space-normal',
+      cellClass: 'overflow-hidden',
       cellRenderer: ({ value }) => this.actionRenderer(value, icon, action),
     }
   }
@@ -137,7 +162,9 @@ export class InventoryGridComponent implements OnChanges {
       headerName: 'Info',
       filter: false,
       sortable: false,
-      width: 60,
+      resizable: false,
+      suppressMovable: true,
+      maxWidth: 60,
       cellRenderer: ({ value }) => this.actionRenderer(value, 'info', 'detail'),
     }
   }
@@ -164,6 +191,7 @@ export class InventoryGridComponent implements OnChanges {
       width: 80,
       filter: false,
       sortable: false,
+      suppressMovable: true,
       // labels come in as an array of ids [1,2,3]. Ag grid needs them formatted as a string
       valueFormatter: ({ value }: { value: number[] }) => {
         const labels = value
@@ -187,17 +215,6 @@ export class InventoryGridComponent implements OnChanges {
     }
   }
 
-  resetGrid = () => {
-    if (!this.gridApi) return
-
-    this.gridApi.setFilterModel(null)
-    this.gridApi.applyColumnState({ state: [], applyOrder: true })
-    this.gridApi.resetColumnState()
-    this.gridApi.refreshClientSideRowModel()
-    this.gridApi.refreshCells({ force: true })
-    this.gridReset.emit()
-  }
-
   /*
    * ascending sorts formatted as 'column_id'
    * descending sorts formatted as '-column_id'
diff --git a/src/app/modules/inventory-list/list/inventory.component.html b/src/app/modules/inventory-list/list/inventory.component.html
index 62137c08..a3a02815 100644
--- a/src/app/modules/inventory-list/list/inventory.component.html
+++ b/src/app/modules/inventory-list/list/inventory.component.html
@@ -43,8 +43,9 @@
     <!-- Filter and Sort chips -->
     @if (gridApi && columnDefs) {
       <seed-inventory-filter-sort-chips
-        [gridApi]="gridApi"
+        [columns]="columns"
         [columnDefs]="columnDefs"
+        [gridApi]="gridApi"
         [type]="type"
         [userSettings]="userSettings"
       ></seed-inventory-filter-sort-chips>
@@ -54,17 +55,20 @@
     <seed-inventory-grid
       #grid
       [columnDefs]="columnDefs"
+      [currentUser]="currentUser"
       [inventoryType]="type"
       [labelMap]="labelMap"
+      [orgId]="orgId"
+      [orgUserId]="orgUserId"
       [pagination]="pagination"
       [rowData]="rowData"
       [selectedViewIds]="selectedViewIds"
       [type]="type"
+      [userSettings]="userSettings"
       (pageChange)="onPageChange($event)"
       (filterSortChange)="onFilterSortChange($event)"
       (gridReady)="onGridReady($event)"
       (selectionChanged)="onSelectionChanged()"
-      (gridReset)="onGridReset()"
     ></seed-inventory-grid>
   </div>
 </div>
diff --git a/src/app/modules/inventory-list/list/inventory.component.ts b/src/app/modules/inventory-list/list/inventory.component.ts
index 72380b6c..81d1e512 100644
--- a/src/app/modules/inventory-list/list/inventory.component.ts
+++ b/src/app/modules/inventory-list/list/inventory.component.ts
@@ -5,8 +5,8 @@ import { ActivatedRoute } from '@angular/router'
 import type { ColDef, GridApi } from 'ag-grid-community'
 import type { Observable } from 'rxjs'
 import { BehaviorSubject, catchError, combineLatest, filter, map, of, Subject, switchMap, takeUntil, tap } from 'rxjs'
-import type { CurrentUser, Cycle, Label, OrganizationUserResponse, OrganizationUserSettings } from '@seed/api'
-import { CycleService, InventoryService, LabelService, OrganizationService, UserService } from '@seed/api'
+import type { Column, CurrentUser, Cycle, Label, OrganizationUserResponse, OrganizationUserSettings } from '@seed/api'
+import { ColumnService, CycleService, InventoryService, LabelService, OrganizationService, UserService } from '@seed/api'
 import { InventoryTabComponent, PageComponent } from '@seed/components'
 import { SharedImports } from '@seed/directives'
 import { MaterialImports } from '@seed/materials'
@@ -20,7 +20,6 @@ import type {
   Profile,
 } from 'app/modules/inventory'
 import { ActionsComponent, ConfigSelectorComponent, FilterSortChipsComponent, InventoryGridComponent } from './grid'
-// import { CellHeaderMenuComponent } from './grid/cell-header-menu.component'
 
 @Component({
   selector: 'seed-inventory',
@@ -40,6 +39,7 @@ import { ActionsComponent, ConfigSelectorComponent, FilterSortChipsComponent, In
 })
 export class InventoryComponent implements OnDestroy, OnInit {
   private _activatedRoute = inject(ActivatedRoute)
+  private _columnService = inject(ColumnService)
   private _cycleService = inject(CycleService)
   private _inventoryService = inject(InventoryService)
   private _organizationService = inject(OrganizationService)
@@ -49,6 +49,7 @@ export class InventoryComponent implements OnDestroy, OnInit {
   readonly tabs: InventoryType[] = ['properties', 'taxlots']
   readonly type = this._activatedRoute.snapshot.paramMap.get('type') as InventoryType
   chunk = 100
+  columns: Column[] = []
   columnDefs: ColDef[] = []
   currentUser: CurrentUser
   cycle: Cycle
@@ -135,8 +136,10 @@ export class InventoryComponent implements OnDestroy, OnInit {
   getDependencies(org_id: number) {
     this.orgId = org_id
     this._cycleService.getCycles(this.orgId)
+    const columns$ = this.type === 'taxlots' ? this._columnService.taxLotColumns$ : this._columnService.propertyColumns$
 
     return combineLatest([
+      columns$,
       this._userService.currentUser$,
       this._cycleService.cycles$,
       this._labelService.labels$,
@@ -147,10 +150,11 @@ export class InventoryComponent implements OnDestroy, OnInit {
   /*
    * set class variables: cycles, profiles, inventory. returns profile id
    */
-  setDependencies([currentUser, cycles, labels, profiles]: InventoryDependencies) {
+  setDependencies([columns, currentUser, cycles, labels, profiles]: InventoryDependencies) {
     if (!cycles) {
       return null
     }
+    this.columns = columns
 
     const { org_user_id, settings } = currentUser
     this.currentUser = currentUser
@@ -272,12 +276,6 @@ export class InventoryComponent implements OnDestroy, OnInit {
     return this._organizationService.updateOrganizationUser(this.orgUserId, this.orgId, this.userSettings)
   }
 
-  onGridReset() {
-    this.userSettings.filters = {}
-    this.userSettings.sorts = {}
-    this.refreshInventory$.next()
-  }
-
   onPageChange(page: number) {
     this.page = page
     this.refreshInventory$.next()
diff --git a/src/app/modules/inventory/inventory.types.ts b/src/app/modules/inventory/inventory.types.ts
index 7c08ce37..e6396557 100644
--- a/src/app/modules/inventory/inventory.types.ts
+++ b/src/app/modules/inventory/inventory.types.ts
@@ -119,7 +119,7 @@ export type FilterSortChip = {
   original: string;
 }
 
-export type InventoryDependencies = [CurrentUser, Cycle[], Label[], Profile[]]
+export type InventoryDependencies = [Column[], CurrentUser, Cycle[], Label[], Profile[]]
 
 type AccessLevelInstance = {
   id: number;
diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index 5cf5ee5b..c3b177b8 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -134,6 +134,10 @@
       overflow: visible !important
     }
   }
+  
+  .ng-star-inserted {
+    width: 100%;
+  }
 }
 
 .seed-dialog-panel {
@@ -214,6 +218,10 @@
   }
 }
 
+.menu-option {
+  @apply w-full p-2 flex items-center gap-4 rounded hover:bg-[#F4F5F4] hover:dark:bg-[#2E3B4A] text-sm cursor-pointer
+}
+
 .vertical-divider {
   @apply border
 }