diff --git a/frontend/src/pages/project/Overview.vue b/frontend/src/pages/project/Overview.vue
index 2ae36394ce..3a0913561b 100644
--- a/frontend/src/pages/project/Overview.vue
+++ b/frontend/src/pages/project/Overview.vue
@@ -9,6 +9,9 @@
                 <p>It will always run the latest flow deployed in Node-RED and use the latest credentials and runtime settings defined in the Projects settings.</p>
                 <p>To edit an Applications flow, open the editor of the Instance.</p>
             </template>
+            <template #tools>
+                <ff-button v-if="hasPermission('project:create')" data-action="create-project-1" kind="primary" size="small" :to="`/team/${team.slug}/projects/create`" data-nav="create-instance"><template #icon-left><PlusSmIcon /></template>Create Instance</ff-button>
+            </template>
         </SectionTopMenu>
 
         <div class="space-y-6 mb-12">
@@ -205,6 +208,7 @@ import DeviceCredentialsDialog from '../team/Devices/dialogs/DeviceCredentialsDi
 import DeviceLastSeenBadge from '@/pages/device/components/DeviceLastSeenBadge'
 import DeploymentName from './components/cells/DeploymentName.vue'
 import DeviceLink from './components/cells/DeviceLink.vue'
+import InstanceLink from './components/cells/InstanceLink.vue'
 import LastSeen from './components/cells/LastSeen.vue'
 import ProjectEditorLink from './components/cells/ProjectEditorLink.vue'
 import ProjectStatusBadge from '@/pages/project/components/ProjectStatusBadge'
@@ -246,6 +250,19 @@ export default {
         columns () {
             return [
                 { label: 'Device', key: 'name', class: ['w-64'], sortable: true, component: { is: markRaw(DeviceLink) } },
+                {
+                    label: 'Instance',
+                    key: 'project',
+                    class: ['w-64'],
+                    sortable: true,
+                    component: {
+                        is: markRaw(InstanceLink),
+                        map: {
+                            id: 'project.id',
+                            name: 'project.name'
+                        }
+                    }
+                },
                 { label: 'Last Seen', key: 'lastSeenAt', class: ['w-32'], sortable: true, component: { is: markRaw(DeviceLastSeenBadge) } },
                 { label: 'Last Known Status', class: ['w-32'], component: { is: markRaw(ProjectStatusBadge) } },
                 { label: 'Deployed Snapshot', class: ['w-48'], component: { is: markRaw(Snapshot) } }
diff --git a/frontend/src/pages/project/components/ProjectChargesTable.vue b/frontend/src/pages/project/components/ProjectChargesTable.vue
deleted file mode 100644
index 9223508236..0000000000
--- a/frontend/src/pages/project/components/ProjectChargesTable.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-    <div
-        v-if="projectType && (pricingDetails?.cost > 0 || subscription?.customer?.balance > 0)"
-        class="pb-4 mb-4 border-b border-gray-300"
-        data-el="charges-table"
-    >
-        <h1 class="text-lg font-medium mb-2 border-b border-gray-700">
-            Charges
-        </h1>
-        <div
-            class="grid grid gap-x-1 gap-y-4 text-sm text-sm mt-4 ml-4"
-            style="grid-template-columns: 1fr 200px auto"
-        >
-            <template v-if="pricingDetails?.cost">
-                <div data-el="selected-project-type-name">
-                    1 x {{ pricingDetails.name }}
-                </div>
-                <div
-                    data-el="selected-project-type-cost"
-                    class="text-right"
-                >
-                    <template v-if="trialMode">
-                        Free during the trial, then
-                    </template>
-                    {{ formatCurrency(pricingDetails.cost) }}
-                </div>
-                <div
-                    v-if="pricingDetails?.interval"
-                    data-el="selected-project-type-interval"
-                    class="text-left"
-                >
-                    /{{ pricingDetails.interval }}
-                </div>
-                <div v-else />
-            </template>
-            <template v-if="subscription?.customer?.balance">
-                <div data-el="credit-balance-row">
-                    Credit Balance
-                </div>
-                <div
-                    data-el="credit-balance-amount"
-                    class="text-right"
-                >
-                    {{ formatCurrency(subscription?.customer?.balance) }}
-                </div>
-                <div />
-            </template>
-        </div>
-    </div>
-    <FormRow
-        v-if="!trialMode"
-        id="billing-confirmation"
-        v-model="localConfirmed"
-        type="checkbox"
-    >
-        Confirm additional charges
-        <template
-            v-if="selectedCostAfterCredit >= 0"
-            #description
-        >
-            {{ formatCurrency(selectedCostAfterCredit) }} now
-            <span v-if="pricingDetails?.interval">
-                then {{ formatCurrency(pricingDetails.cost) }}/{{ pricingDetails.interval }}
-            </span>
-        </template>
-    </FormRow>
-</template>
-
-<script>
-
-import FormRow from '@/components/FormRow'
-
-import formatCurrency from '@/mixins/Currency.js'
-
-export default {
-    name: 'ProjectChargesTable',
-    components: {
-        FormRow
-    },
-    mixins: [formatCurrency],
-    props: {
-        subscription: {
-            type: Object,
-            default: null
-        },
-        confirmed: {
-            type: Boolean,
-            default: false
-        },
-        projectType: {
-            type: Object,
-            default: null
-        },
-        trialMode: {
-            type: Boolean,
-            default: false
-        }
-    },
-    emits: [
-        'update:confirmed'
-    ],
-    computed: {
-        selectedCostAfterCredit () {
-            return (this.pricingDetails?.cost ?? 0) + (this.subscription?.customer?.balance ?? 0)
-        },
-        localConfirmed: {
-            get () {
-                return this.confirmed
-            },
-            set (value) {
-                this.$emit('update:confirmed', value)
-            }
-        },
-        pricingDetails () {
-            if (!this.projectType) {
-                return {}
-            }
-
-            return {
-                name: this.projectType.name,
-                currency: this.projectType.properties?.billingDescription?.split('/')[0].replace(/[\d.]+/, ''),
-                cost: (Number(this.projectType.properties?.billingDescription?.split('/')[0].replace(/[^\d.]+/, '')) || 0) * 100,
-                interval: this.projectType.properties?.billingDescription?.split('/')[1]
-            }
-        }
-    }
-}
-</script>
diff --git a/frontend/src/pages/project/components/ProjectCreditBanner.vue b/frontend/src/pages/project/components/ProjectCreditBanner.vue
deleted file mode 100644
index c6364ac5da..0000000000
--- a/frontend/src/pages/project/components/ProjectCreditBanner.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-    <div
-        v-if="subscription?.customer?.balance"
-        class="w-full text-sm text-blue-600 italic"
-        data-el="credit-balance-banner"
-    >
-        You have a credit balance of {{ formatCurrency(Math.abs(subscription.customer.balance)) }} that will be applied to this project
-    </div>
-</template>
-
-<script>
-
-import formatCurrency from '@/mixins/Currency.js'
-
-export default {
-    name: 'ProjectCreditBanner',
-    mixins: [formatCurrency],
-    props: {
-        subscription: {
-            type: Object,
-            default: null
-        }
-    }
-}
-</script>
diff --git a/frontend/src/pages/project/components/ProjectForm.vue b/frontend/src/pages/project/components/ProjectForm.vue
deleted file mode 100644
index 2afc9999ba..0000000000
--- a/frontend/src/pages/project/components/ProjectForm.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-    <form
-        class="space-y-6"
-        @submit.prevent="$emit('on-submit', input)"
-    >
-        <SectionTopMenu
-            :hero="creatingNew ? 'Create a new project' : 'Update Project'"
-        />
-
-        <!-- Form title -->
-        <div class="mb-8 text-sm text-gray-500">
-            <template v-if="creatingNew">
-                <template v-if="!isCopyProject">
-                    Let's get your new Node-RED project setup in no time.
-                </template>
-            </template>
-            <template v-else>
-                Here you can make changes to the projects settings.
-            </template>
-        </div>
-
-        <!-- Project Name -->
-        <div>
-            <FormRow
-                v-model="input.name"
-                :error="errors.name || submitErrors?.name"
-                :disabled="!creatingNew"
-                data-form="project-name"
-            >
-                <template #default>
-                    Project Name
-                </template>
-                <template
-                    v-if="creatingNew"
-                    #description
-                >
-                    Please note, currently, project names cannot be changed once a project is created
-                </template>
-                <template
-                    v-if="creatingNew"
-                    #append
-                >
-                    <ff-button
-                        kind="secondary"
-                        @click="refreshName"
-                    >
-                        <template #icon>
-                            <RefreshIcon />
-                        </template>
-                    </ff-button>
-                </template>
-            </FormRow>
-        </div>
-
-        <!-- Project Type -->
-        <div
-            v-if="errors.projectTypes"
-            class="text-red-400 text-xs"
-        >
-            {{ errors.projectTypes }}
-        </div>
-        <div
-            v-else
-            class="flex flex-wrap items-stretch"
-        >
-            <label class="w-full block text-sm font-medium text-gray-700">Choose your Project Type</label>
-            <ProjectCreditBanner :subscription="subscription" />
-            <ff-tile-selection
-                v-model="input.projectType"
-                class="mt-5"
-                data-form="project-type"
-            >
-                <ff-tile-selection-option
-                    v-for="(projType, index) in projectTypes"
-                    :key="index"
-                    :label="projType.name"
-                    :description="projType.description"
-                    :price="projType.price"
-                    :price-interval="projType.priceInterval"
-                    :value="projType.id"
-                    :disabled="projType.disabled"
-                />
-            </ff-tile-selection>
-        </div>
-
-        <!-- Stack -->
-        <div class="flex flex-wrap gap-1 items-stretch">
-            <label class="w-full block text-sm font-medium text-gray-700 mb-4">Choose your Stack</label>
-            <label
-                v-if="!input.projectType"
-                class="text-sm text-gray-400"
-            >
-                Please select a Project Type first.</label>
-            <label
-                v-if="errors.stack"
-                class="text-sm text-gray-400"
-            >
-                {{ errors.stack }}
-            </label>
-            <ff-tile-selection
-                v-if="input.projectType"
-                v-model="input.stack"
-                data-form="project-stack"
-            >
-                <ff-tile-selection-option
-                    v-for="(stack, index) in stacks"
-                    :key="index"
-                    :value="stack.id"
-                    :label="stack.label || stack.name"
-                />
-            </ff-tile-selection>
-        </div>
-
-        <!-- Template -->
-        <div
-            v-if="creatingNew && templates.length > 1 "
-            class="flex flex-wrap gap-1 items-stretch"
-        >
-            <label class="w-full block text-sm font-medium text-gray-700 mb-1">Template</label>
-            <label
-                v-if="!input.projectType && !input.stack"
-                class="text-sm text-gray-400"
-            >Please select a Project Type &amp; Stack first.</label>
-            <label
-                v-if="errors.template"
-                class="text-sm text-gray-400"
-            >{{ errors.template }}</label>
-            <ff-tile-selection
-                v-if="input.projectType"
-                v-model="input.template"
-                data-form="project-template"
-            >
-                <ff-tile-selection-option
-                    v-for="(t, index) in templates"
-                    :key="index"
-                    :value="t.id"
-                    :disabled="isCopyProject"
-                    :label="t.name"
-                    :description="t.description"
-                />
-            </ff-tile-selection>
-        </div>
-
-        <!-- Copying a project -->
-        <template v-if="isCopyProject">
-            <p class="text-gray-500">
-                Select the components to copy from '{{ sourceProject?.name }}'
-            </p>
-            <ExportProjectComponents
-                id="exportSettings"
-                v-model="copyParts"
-            />
-        </template>
-
-        <!-- Billing details -->
-        <div v-if="showBilling">
-            <ProjectChargesTable
-                v-model:confirmed="input.billingConfirmation"
-                :project-type="selectedProjectType"
-                :subscription="subscription"
-                :trialMode="isTrialProjectSelected"
-            />
-        </div>
-
-        <!-- Submit -->
-        <div class="flex flex-wrap gap-1 items-center">
-            <ff-button
-                v-if="!creatingNew"
-                class="ff-btn--secondary"
-                @click="$router.back()"
-            >
-                Cancel
-            </ff-button>
-
-            <ff-button
-                :disabled="!submitEnabled"
-                :data-action="creatingNew ? 'create-project' : 'update-project'"
-                type="submit"
-            >
-                <template v-if="creatingNew">
-                    Create Project
-                </template>
-                <template v-else>
-                    Confirm Changes
-                </template>
-            </ff-button>
-            <label
-                v-if="!creatingNew && !formDirty"
-                class="text-sm text-gray-400"
-            >
-                No changes have been made
-            </label>
-        </div>
-    </form>
-</template>
-
-<script>
-import { RefreshIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
-
-import ExportProjectComponents from './ExportProjectComponents'
-import ProjectChargesTable from './ProjectChargesTable'
-import ProjectCreditBanner from './ProjectCreditBanner'
-
-import billingApi from '@/api/billing'
-import projectTypesApi from '@/api/projectTypes'
-import stacksApi from '@/api/stacks'
-import templatesApi from '@/api/templates'
-
-import FormRow from '@/components/FormRow'
-import SectionTopMenu from '@/components/SectionTopMenu'
-
-import NameGenerator from '@/utils/name-generator'
-
-export default {
-    name: 'ProjectForm',
-    components: {
-        ExportProjectComponents,
-        FormRow,
-        ProjectChargesTable,
-        ProjectCreditBanner,
-        RefreshIcon,
-        SectionTopMenu
-    },
-
-    props: {
-        team: {
-            required: true,
-            type: Object
-        },
-        billingEnabled: {
-            default: false,
-            type: Boolean
-        },
-        project: {
-            default: null,
-            type: Object
-        },
-        sourceProject: {
-            default: null,
-            type: Object
-        },
-        submitErrors: {
-            default: null,
-            type: Object
-        }
-    },
-    emits: ['on-submit'],
-    data () {
-        const project = this.project || this.sourceProject
-
-        return {
-            stacks: [],
-            templates: [],
-            projectTypes: [],
-            subscription: null,
-            input: {
-                billingConfirmation: false,
-
-                // Only read name from existing project, never source
-                name: this.project?.name || NameGenerator(),
-
-                // Handle both full project objects and short-form project details
-                projectType: project?.projectType?.id || project?.projectType || '',
-                stack: project?.stack?.id || project?.stack || '',
-                template: project?.template?.id || project?.template || ''
-            },
-            errors: {
-                name: '',
-                projectType: '',
-                stack: '',
-                template: ''
-            },
-            copyParts: {
-                flows: true,
-                credentials: true,
-                nodes: true,
-                envVars: 'all'
-            },
-            selectedProjectType: null
-        }
-    },
-    computed: {
-        ...mapState('account', ['settings']),
-        creatingNew () {
-            return !this.project?.id
-        },
-        isCopyProject () {
-            return !!this.sourceProject && this.creatingNew
-        },
-        projectTypeChanged () {
-            return this.project?.projectType?.id !== this.input.projectType
-        },
-        projectStackChanged () {
-            return ((this.project?.stack?.id || this.stacks?.[0]?.id) !== this.input.stack)
-        },
-        formDirty () {
-            return this.creatingNew || this.projectTypeChanged || this.projectStackChanged
-        },
-        showBilling () {
-            return this.billingEnabled && (this.creatingNew || this.projectTypeChanged)
-        },
-        formValid () {
-            return this.input.name && !this.errors.name &&
-              this.input.projectType && !this.errors.projectType &&
-              this.input.stack && !this.errors.stack &&
-              (this.creatingNew ? (this.input.template && !this.errors.template) : true)
-        },
-        submitEnabled () {
-            const billingConfirmed = !this.showBilling || this.team.billing?.trial || this.input.billingConfirmation
-            return billingConfirmed && this.formValid && this.formDirty
-        },
-        isTrialProjectSelected () {
-            //  - Team is in trial mode, and
-            //  - Team billing is not configured, or
-            //  - team billing is configured, but they still have an available
-            //     trial project to create, and they have selected the trial
-            //     project type
-            return this.team.billing?.trial && (
-                !this.team.billing?.active || (
-                    this.team.billing.trialProjectAllowed &&
-                    this.selectedProjectType?.id === this.settings['user:team:trial-mode:projectType']
-                )
-            )
-        }
-    },
-    watch: {
-        'input.name': function (value, oldValue) {
-            if (/^[a-zA-Z][a-zA-Z0-9-]*$/.test(value)) {
-                this.errors.name = ''
-            } else {
-                this.errors.name = 'Names must only include a→z, A→Z, -, 0→9 and can not start with 0→9'
-            }
-        },
-        'input.projectType': async function (value, oldValue) {
-            if (value) {
-                await this.updateProjectType(value)
-            }
-        }
-    },
-    async created () {
-        const projectTypesPromise = projectTypesApi.getProjectTypes()
-        const templateListPromise = templatesApi.getTemplates()
-
-        this.projectTypes = (await projectTypesPromise).types
-        this.templates = (await templateListPromise).templates.filter(template => template.active)
-
-        let activeProjectTypeCount = this.projectTypes.length
-        if (this.billingEnabled) {
-            try {
-                this.subscription = await billingApi.getSubscriptionInfo(this.team.id)
-            } catch (err) {
-                if (err.response?.data?.code === 'not_found') {
-                    // This team has no subscription.
-                    if (!this.team.billing?.trial || this.team.billing?.trialEnded) {
-                        throw err
-                    }
-                }
-            }
-            this.projectTypes.forEach(pt => {
-                if (pt.properties?.billingDescription) {
-                    pt.price = pt.properties?.billingDescription?.split('/')[0]
-                    pt.priceInterval = pt.properties?.billingDescription?.split('/')[1]
-                }
-                if (this.team.billing?.trial) {
-                    const isTrialProjectType = pt.id === this.settings['user:team:trial-mode:projectType']
-                    if (!this.team.billing?.active) {
-                        // No active billing - only allow the trial project type
-                        pt.disabled = !isTrialProjectType
-                    }
-                    if (isTrialProjectType && this.team.billing?.trialProjectAllowed) {
-                        pt.price = 'Free Trial'
-                        pt.priceInterval = pt.properties?.billingDescription
-                    }
-                    if (pt.disabled) {
-                        activeProjectTypeCount--
-                    }
-                }
-            })
-        }
-
-        if (this.projectTypes.length === 0) {
-            this.errors.projectType = 'No project types available. Ask an Administrator to create a new project type'
-        } else if (activeProjectTypeCount === 1) {
-            this.input.projectType = this.projectTypes.find(pt => !pt.disabled).id
-        }
-
-        if (this.creatingNew && this.templates.length === 0) {
-            this.errors.template = 'No templates available. Ask an Administrator to create a new template definition'
-        }
-
-        if (this.creatingNew && !this.isCopyProject) {
-            this.input.template = this.templates[0]?.id || ''
-        }
-
-        // Callback loads in related stacks
-        if (this.input.projectType) {
-            this.updateProjectType(this.input.projectType)
-        }
-    },
-    async beforeMount () {
-        // Billing feature must be enabled
-        if (!this.billingEnabled) {
-            return
-        }
-
-        // Team must not have billing set up
-        if (this.team.billing?.active ?? true) {
-            return
-        }
-
-        // Redirect to billing if:
-        //   - team has cancelled their subscription
-        //   - team is not a trial team, or:
-        //   - team is a trial team and:
-        //     - has expired, or:
-        //     - already has a project created
-        if (this.team.billing?.canceled ||
-            !this.team.billing?.trial ||
-            (this.team.billing?.trialEnded || this.team.projectCount > 0)
-        ) {
-            this.$router.push({
-                path: `/team/${this.team.slug}/billing`
-            })
-        }
-    },
-    methods: {
-        refreshName () {
-            this.input.name = NameGenerator()
-        },
-        findStackById (stackId) {
-            return this.stacks.find(stack => stack.id === stackId)
-        },
-        async updateProjectType (projectTypeId) {
-            const projectType = this.projectTypes.find(pt => pt.id === projectTypeId)
-            this.selectedProjectType = projectType
-            await this.updateStacks(projectType)
-        },
-        async updateStacks (projectType) {
-            this.errors.stack = ''
-
-            const stackList = await stacksApi.getStacks(null, null, null, projectType.id)
-            this.stacks = stackList.stacks.filter(stack => stack.active)
-
-            if (this.stacks.length === 0) {
-                this.input.stack = null
-                this.errors.stack = 'No stacks available for this project type. Ask an Administrator to create a new stack definition'
-                return
-            }
-
-            // Read stack from source project
-            if (this.sourceProject?.stack && this.findStackById(this.sourceProject.stack.id)) {
-                this.input.stack = this.sourceProject.stack.id
-                return
-            }
-
-            // Read from currently edited project
-            if (this.project?.stack && this.findStackById(this.project.stack.id)) {
-                this.input.stack = this.project.stack.id
-                return
-            }
-
-            // Read from project type
-            if (projectType.defaultStack && this.findStackById(projectType.defaultStack)) {
-                this.input.stack = projectType.defaultStack
-                return
-            }
-
-            // Fallback to first
-            this.input.stack = this.stacks[0]?.id
-        }
-    }
-}
-</script>
diff --git a/frontend/src/pages/project/components/cells/ApplicationLink.vue b/frontend/src/pages/project/components/cells/ApplicationLink.vue
new file mode 100644
index 0000000000..b92752e982
--- /dev/null
+++ b/frontend/src/pages/project/components/cells/ApplicationLink.vue
@@ -0,0 +1,24 @@
+<template>
+    <template v-if="id">
+        <router-link :to="{ name: 'Project', params: { id: id }}">{{ name }}</router-link>
+    </template>
+    <template v-else><span class="italic text-gray-500">Unassigned</span></template>
+</template>
+
+<script>
+export default {
+    name: 'ApplicationLink',
+    inheritAttrs: false,
+    props: {
+        id: {
+            type: String,
+            default: null
+        },
+        name: {
+            type: String,
+            default: null
+        }
+
+    }
+}
+</script>
diff --git a/frontend/src/pages/project/components/cells/DeploymentName.vue b/frontend/src/pages/project/components/cells/DeploymentName.vue
index 61e5b0eabf..56cca78bd9 100644
--- a/frontend/src/pages/project/components/cells/DeploymentName.vue
+++ b/frontend/src/pages/project/components/cells/DeploymentName.vue
@@ -15,6 +15,7 @@ import { CloudIcon } from '@heroicons/vue/outline'
 export default {
     name: 'DeploymentName',
     components: { CloudIcon },
+    inheritAttrs: false,
     props: {
         name: {
             required: true,
diff --git a/frontend/src/pages/project/components/cells/DeviceLink.vue b/frontend/src/pages/project/components/cells/DeviceLink.vue
index 9be5002a11..c52605ad01 100644
--- a/frontend/src/pages/project/components/cells/DeviceLink.vue
+++ b/frontend/src/pages/project/components/cells/DeviceLink.vue
@@ -17,6 +17,7 @@ import { ChipIcon } from '@heroicons/vue/solid'
 export default {
     name: 'DeviceLink',
     components: { ChipIcon },
+    inheritAttrs: false,
     props: {
         id: {
             required: true,
diff --git a/frontend/src/pages/project/components/cells/InstanceLink.vue b/frontend/src/pages/project/components/cells/InstanceLink.vue
new file mode 100644
index 0000000000..4edf0066aa
--- /dev/null
+++ b/frontend/src/pages/project/components/cells/InstanceLink.vue
@@ -0,0 +1,26 @@
+<template>
+    <template v-if="id">
+        <router-link :to="{ name: 'Instance', params: { id }}">{{ name }}</router-link>
+    </template>
+    <template v-else><span class="italic text-gray-500">Unassigned</span></template>
+</template>
+
+<script>
+// TODO This should link to the connected devices page for an instance (once one exists)
+
+export default {
+    name: 'InstanceLink',
+    inheritAttrs: false,
+    props: {
+        id: {
+            type: String,
+            default: null
+        },
+        name: {
+            type: String,
+            default: null
+        }
+
+    }
+}
+</script>
diff --git a/frontend/src/pages/project/components/cells/LastSeen.vue b/frontend/src/pages/project/components/cells/LastSeen.vue
index 022f7ce882..46947e3cae 100644
--- a/frontend/src/pages/project/components/cells/LastSeen.vue
+++ b/frontend/src/pages/project/components/cells/LastSeen.vue
@@ -13,6 +13,7 @@
 <script>
 export default {
     name: 'LastSeen',
+    inheritAttrs: false,
     props: {
         lastSeenSince: {
             required: true,
diff --git a/frontend/src/pages/project/components/cells/ProjectEditorLink.vue b/frontend/src/pages/project/components/cells/ProjectEditorLink.vue
index f126517371..36cd77c54b 100644
--- a/frontend/src/pages/project/components/cells/ProjectEditorLink.vue
+++ b/frontend/src/pages/project/components/cells/ProjectEditorLink.vue
@@ -21,6 +21,7 @@ import { ExternalLinkIcon } from '@heroicons/vue/solid'
 export default {
     name: 'ProjectEditorLink',
     components: { ExternalLinkIcon },
+    inheritAttrs: false,
     props: {
         disabled: {
             default: false,
diff --git a/frontend/src/pages/project/components/cells/Snapshot.vue b/frontend/src/pages/project/components/cells/Snapshot.vue
index 7ef849d1c1..b709ec6635 100644
--- a/frontend/src/pages/project/components/cells/Snapshot.vue
+++ b/frontend/src/pages/project/components/cells/Snapshot.vue
@@ -28,6 +28,7 @@ export default {
         ExclamationIcon,
         CheckCircleIcon
     },
+    inheritAttrs: false,
     props: {
         activeSnapshot: {
             default: null,
diff --git a/frontend/src/pages/team/Devices/dialogs/DeviceAssignProjectDialog.vue b/frontend/src/pages/team/Devices/dialogs/DeviceAssignProjectDialog.vue
index ddd0b8e004..0ec0cb33c6 100644
--- a/frontend/src/pages/team/Devices/dialogs/DeviceAssignProjectDialog.vue
+++ b/frontend/src/pages/team/Devices/dialogs/DeviceAssignProjectDialog.vue
@@ -11,7 +11,7 @@
                 <p class="text-sm text-gray-500">
                     Select the instance to add the device to:
                 </p>
-                <FormRow :options="projects" v-model="input.project">Project</FormRow>
+                <FormRow :options="projects" v-model="input.project">Application Instance</FormRow>
             </form>
         </template>
     </ff-dialog>
diff --git a/frontend/src/pages/team/Devices/index.vue b/frontend/src/pages/team/Devices/index.vue
index a93a1b795e..abf93f364c 100644
--- a/frontend/src/pages/team/Devices/index.vue
+++ b/frontend/src/pages/team/Devices/index.vue
@@ -32,8 +32,8 @@
                 >
                     <template v-if="hasPermission('device:edit')" v-slot:context-menu="{row}">
                         <ff-list-item label="Edit Details" @click="deviceAction('edit', row.id)"/>
-                        <ff-list-item v-if="!row.project" label="Add to Project" @click="deviceAction('assignToProject', row.id)" />
-                        <ff-list-item v-else label="Remove from Project" @click="deviceAction('removeFromProject', row.id)" />
+                        <ff-list-item v-if="!row.project" label="Add to Application Instance" @click="deviceAction('assignToProject', row.id)" />
+                        <ff-list-item v-else label="Remove from Application Instance" @click="deviceAction('removeFromProject', row.id)" />
                         <ff-list-item kind="danger" label="Regenerate Credentials" @click="deviceAction('updateCredentials', row.id)"/>
                         <ff-list-item v-if="hasPermission('device:delete')" kind="danger" label="Delete Device" @click="deviceAction('delete', row.id)" />
                     </template>
@@ -75,27 +75,9 @@ import TeamDeviceCreateDialog from './dialogs/TeamDeviceCreateDialog'
 import DeviceCredentialsDialog from './dialogs/DeviceCredentialsDialog'
 import DeviceAssignProjectDialog from './dialogs/DeviceAssignProjectDialog'
 
-const DeviceLink = {
-    template: `
-        <router-link :to="{ name: 'Device', params: { id: id } }" class="flex">
-            <ChipIcon class="w-6 mr-2 text-gray-500" />
-            <div class="flex flex-col space-y-1">
-                <span class="text-lg">{{name}}</span>
-                <span class="text-xs text-gray-500">id: {{id}}</span>
-            </div>
-        </router-link>`,
-    props: ['id', 'name', 'type'],
-    components: { ChipIcon }
-}
-
-const ProjectLink = {
-    template: `
-        <template v-if="project">
-            <router-link :to="{ name: 'ProjectInstances', params: { id: project.id }}">{{ project.name }}</router-link>
-        </template>
-        <template v-else><span class="italic text-gray-500">unassigned</span></template>`,
-    props: ['project']
-}
+import DeviceLink from '../../project/components/cells/DeviceLink'
+import InstanceLink from '../../project/components/cells/InstanceLink'
+import ApplicationLink from '../../project/components/cells/ApplicationLink'
 
 export default {
     name: 'TeamDevices',
@@ -222,7 +204,32 @@ export default {
                 { label: 'Device', class: ['w-64'], key: 'name', sortable: true, component: { is: markRaw(DeviceLink) } },
                 { label: 'Last Seen', class: ['w-32'], key: 'lastSeenAt', sortable: true, component: { is: markRaw(DeviceLastSeenBadge) } },
                 { label: 'Last Known Status', class: ['w-32'], key: 'status', sortable: true, component: { is: markRaw(ProjectStatusBadge) } },
-                { label: 'Project', class: ['w-64'], key: 'project', sortable: true, component: { is: markRaw(ProjectLink) } }
+                {
+                    label: 'Application',
+                    class: ['w-64'],
+                    key: 'project',
+                    sortable: true,
+                    component: {
+                        is: markRaw(ApplicationLink),
+                        map: {
+                            id: 'project.id',
+                            name: 'project.name'
+                        }
+                    }
+                },
+                {
+                    label: 'Instance',
+                    class: ['w-64'],
+                    key: 'project',
+                    sortable: true,
+                    component: {
+                        is: markRaw(InstanceLink),
+                        map: {
+                            id: 'project.id',
+                            name: 'project.name'
+                        }
+                    }
+                }
             ]
         }
     },