diff --git a/package-lock.json b/package-lock.json
index d54037497..8dd6e527c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
             "name": "@prefecthq/orion-design",
             "version": "1.2.22",
             "dependencies": {
-                "@prefecthq/graphs": "0.1.15",
+                "@prefecthq/graphs": "0.1.16",
                 "@prefecthq/radar": "0.0.19",
                 "@prefecthq/vue-charts": "0.0.19",
                 "axios": "0.27.2",
@@ -937,9 +937,9 @@
             }
         },
         "node_modules/@prefecthq/graphs": {
-            "version": "0.1.15",
-            "resolved": "https://registry.npmjs.org/@prefecthq/graphs/-/graphs-0.1.15.tgz",
-            "integrity": "sha512-PRMIHviJltUVDQ8SAZ+KsSGFardeLnQsX3DkgVJhav/UfgtdQOCpuZjG3+ur/9FIYLcO4wtcfyW/yMgXR4cC3g==",
+            "version": "0.1.16",
+            "resolved": "https://registry.npmjs.org/@prefecthq/graphs/-/graphs-0.1.16.tgz",
+            "integrity": "sha512-l6x4L3GPjsXz7tuvoMq9Qfef/ZHuY7RaiCVk0R6le5TRtm8oMZhNcozi4a136zerGPvLSKmvvS6DkTcrWfUjlw==",
             "dependencies": {
                 "@pixi-essentials/cull": "^1.1.0",
                 "@prefecthq/vue-compositions": "1.0.0",
@@ -6939,9 +6939,9 @@
             }
         },
         "@prefecthq/graphs": {
-            "version": "0.1.15",
-            "resolved": "https://registry.npmjs.org/@prefecthq/graphs/-/graphs-0.1.15.tgz",
-            "integrity": "sha512-PRMIHviJltUVDQ8SAZ+KsSGFardeLnQsX3DkgVJhav/UfgtdQOCpuZjG3+ur/9FIYLcO4wtcfyW/yMgXR4cC3g==",
+            "version": "0.1.16",
+            "resolved": "https://registry.npmjs.org/@prefecthq/graphs/-/graphs-0.1.16.tgz",
+            "integrity": "sha512-l6x4L3GPjsXz7tuvoMq9Qfef/ZHuY7RaiCVk0R6le5TRtm8oMZhNcozi4a136zerGPvLSKmvvS6DkTcrWfUjlw==",
             "requires": {
                 "@pixi-essentials/cull": "^1.1.0",
                 "@prefecthq/vue-compositions": "1.0.0",
diff --git a/package.json b/package.json
index 5d099f730..f614459ea 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "vue-router": "^4.0.12"
     },
     "dependencies": {
-        "@prefecthq/graphs": "0.1.15",
+        "@prefecthq/graphs": "0.1.16",
         "@prefecthq/radar": "0.0.19",
         "@prefecthq/vue-charts": "0.0.19",
         "axios": "0.27.2",
diff --git a/src/components/FlowRunTimeline.vue b/src/components/FlowRunTimeline.vue
index 6312b98a3..cc9d0d24f 100644
--- a/src/components/FlowRunTimeline.vue
+++ b/src/components/FlowRunTimeline.vue
@@ -1,15 +1,24 @@
 <template>
   <div class="flow-run-timeline">
-    <div v-if="graphData.length > 0" class="flow-run-timeline__container">
+    <div class="flow-run-timeline__options">
+      <FlowRunTimelineOptions
+        :layout="layout"
+        :hide-edges="hideEdges"
+        @update:layout="updateLayout"
+        @update:hide-edges="updateHideEdges"
+      />
+    </div>
+    <div v-if="graphData.length > 0" class="flow-run-timeline__graph-wrapper">
       <FlowRunTimeline
-        class="flow-run-timeline__timeline"
-        :class="{ 'flow-run-timeline__timeline--panel-open': showTaskRunPanel }"
+        class="flow-run-timeline__graph"
+        :class="{ 'flow-run-timeline__graph--panel-open': showTaskRunPanel }"
         :graph-data="graphData"
+        :layout="layout"
+        :hide-edges="hideEdges"
         :is-running="isRunning"
         :format-date-fns="formatDateFns"
-        :selected-node-id="selectedNode"
         :theme="theme"
-        layout="nearestParent"
+        :selected-node-id="selectedNode"
         @click="selectNode"
       />
     </div>
@@ -26,11 +35,19 @@
 </template>
 
 <script lang="ts" setup>
-  import { FlowRunTimeline, FormatDateFns, HSL, ThemeStyleOverrides, TimelineNodeData, TimelineThemeOptions } from '@prefecthq/graphs'
+  import {
+    FlowRunTimeline,
+    FormatDateFns,
+    HSL,
+    ThemeStyleOverrides,
+    TimelineNodeData,
+    TimelineNodesLayoutOptions,
+    TimelineThemeOptions
+  } from '@prefecthq/graphs'
   import { useColorTheme } from '@prefecthq/prefect-design'
   import { useSubscription } from '@prefecthq/vue-compositions'
-  import { computed, Ref, ref } from 'vue'
-  import { TaskRunPanel } from '@/components'
+  import { computed, Ref, ref, watch } from 'vue'
+  import { TaskRunPanel, FlowRunTimelineOptions } from '@/components'
   import { useWorkspaceApi } from '@/compositions'
   import { FlowRun, isValidTimelineNodeData } from '@/models'
   import { formatTimeNumeric, formatTimeShortNumeric, formatDate } from '@/utilities'
@@ -41,6 +58,11 @@
 
   const { value: colorThemeValue } = useColorTheme()
 
+  const defaultOptionThresholds = {
+    nearestParentLayout: 100,
+    hideEdges: 40,
+  }
+
   const showTaskRunPanel = ref(false)
   const selectedNode: Ref<string | null> = ref(null)
   const formatDateFns: FormatDateFns = {
@@ -48,6 +70,8 @@
     timeByMinutes: formatTimeShortNumeric,
     date: formatDate,
   }
+  const layout: Ref<TimelineNodesLayoutOptions> = ref('nearestParent')
+  const hideEdges = ref(false)
 
   const selectNode = (value: string | null): void => {
     if (!value || value === selectedNode.value) {
@@ -60,10 +84,18 @@
     showTaskRunPanel.value = true
   }
 
-  const closePanel = (): void => {
+  function closePanel(): void {
     showTaskRunPanel.value = false
   }
 
+  function updateLayout(value: TimelineNodesLayoutOptions): void {
+    layout.value = value
+  }
+
+  function updateHideEdges(value: boolean): void {
+    hideEdges.value = value
+  }
+
   const isRunning = computed(() => {
     return props.flowRun.state?.name.toLowerCase() === 'running'
   })
@@ -86,10 +118,27 @@
     return items
   })
 
+  const unwatchInitialData = watch(graphData, (value) => {
+    if (value.length > 0) {
+      if (value.length > defaultOptionThresholds.nearestParentLayout) {
+        layout.value = 'waterfall'
+      }
+
+      if (value.length > defaultOptionThresholds.hideEdges) {
+        hideEdges.value = true
+      }
+
+      unwatchInitialData()
+    }
+  })
+
+  /*
+  * Theme overrides
+  */
   const documentStyles = getComputedStyle(document.documentElement)
   const bodyStyles = getComputedStyle(document.body)
 
-  const getStateColor = (cssVariable: string): string => {
+  function getStateColor(cssVariable: string): string {
     return bodyStyles.getPropertyValue(cssVariable).trim()
   }
 
@@ -116,7 +165,7 @@
     alphaNodeDimmed: 0.2,
   }))
 
-  const getHslColor = (defaultCssVariable: string, darkCssVariable?: string): HSL => {
+  function getHslColor(defaultCssVariable: string, darkCssVariable?: string): HSL {
     const propertyValue = darkCssVariable && colorThemeValue.value === 'dark'
       ? darkCssVariable
       : defaultCssVariable
@@ -145,23 +194,31 @@
 .flow-run-timeline { @apply
   flex
   overflow-hidden
+  relative
+}
+
+.flow-run-timeline__options { @apply
+  absolute
+  bottom-1
+  right-1
+  z-10
 }
 
-.flow-run-timeline__container { @apply
+.flow-run-timeline__graph-wrapper { @apply
   h-[320px]
   w-full
   relative
   overflow-hidden
 }
 
-.flow-run-timeline__timeline { @apply
+.flow-run-timeline__graph { @apply
   bg-background-600
   dark:bg-background
   rounded-lg
 }
 
 @media (min-width: 640px) {
-  .flow-run-timeline__timeline--panel-open {
+  .flow-run-timeline__graph--panel-open {
     width: calc(100% - 320px);
   }
 }
diff --git a/src/components/FlowRunTimelineOptions.vue b/src/components/FlowRunTimelineOptions.vue
new file mode 100644
index 000000000..367ff5100
--- /dev/null
+++ b/src/components/FlowRunTimelineOptions.vue
@@ -0,0 +1,84 @@
+<template>
+  <p-pop-over
+    class="flow-run-timeline-options"
+    auto-close
+    :placement="placement"
+  >
+    <template #target="{ toggle }">
+      <p-button
+        aria-label="Flow Run Timeline Options"
+        icon="CogIcon"
+        flat
+        @click="toggle"
+      />
+    </template>
+    <div class="flow-run-timeline-options__popover">
+      <p-overflow-menu>
+        <div class="flow-run-timeline-options__popover-option-set">
+          <p-radio-group v-model="layoutModel" :options="layoutOptions">
+            <template #label="{ option }">
+              {{ option.label }}
+            </template>
+          </p-radio-group>
+        </div>
+        <div class="flow-run-timeline-options__popover-option-set">
+          <p-checkbox v-model="hideDependencyArrowsModel" label="Hide Dependency Arrows" />
+        </div>
+      </p-overflow-menu>
+    </div>
+  </p-pop-over>
+</template>
+
+<script lang="ts" setup>
+  import { TimelineNodesLayoutOptions } from '@prefecthq/graphs'
+  import { PButton, positions, PPopOver } from '@prefecthq/prefect-design'
+  import { computed } from 'vue'
+
+  const props = defineProps<{
+    layout: TimelineNodesLayoutOptions,
+    hideEdges: boolean,
+  }>()
+
+  const emit = defineEmits<{
+    (event: 'update:layout', value: TimelineNodesLayoutOptions): void,
+    (event: 'update:hideEdges', value: boolean): void,
+  }>()
+
+  const placement = [positions.topRight, positions.bottomRight, positions.topLeft, positions.bottomLeft]
+
+  const layoutOptions: {
+    value: TimelineNodesLayoutOptions,
+    label: string,
+  }[] = [
+    {
+      value: 'nearestParent',
+      label: 'Nearest Parent Layout',
+    }, {
+      value: 'waterfall',
+      label: 'Waterfall Layout (fast)',
+    },
+  ]
+  const layoutModel = computed({
+    get: () => props.layout,
+    set: (layout) => emit('update:layout', layout),
+  })
+
+  const hideDependencyArrowsModel = computed({
+    get: () => props.hideEdges,
+    set: () => emit('update:hideEdges', !props.hideEdges),
+  })
+</script>
+
+<style>
+.flow-run-timeline-options { @apply
+  inline-block
+}
+
+.flow-run-timeline-options__popover { @apply
+  py-1
+}
+
+.flow-run-timeline-options__popover-option-set { @apply
+  p-3
+}
+</style>
diff --git a/src/components/index.ts b/src/components/index.ts
index 0db5b4eea..1be393623 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -95,6 +95,7 @@ export { default as FlowRunTagsInput } from './FlowRunTagsInput.vue'
 export { default as FlowRunTaskCount } from './FlowRunTaskCount.vue'
 export { default as FlowRunTaskRuns } from './FlowRunTaskRuns.vue'
 export { default as FlowRunTimeline } from './FlowRunTimeline.vue'
+export { default as FlowRunTimelineOptions } from './FlowRunTimelineOptions.vue'
 export { default as FlowsDeleteButton } from './FlowsDeleteButton.vue'
 export { default as FlowsPageEmptyState } from './FlowsPageEmptyState.vue'
 export { default as FlowsTable } from './FlowsTable.vue'