diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index f4f43847..5e252050 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -84,5 +84,5 @@
     "country",
     "postalCode"
   ],
-  "inlineEditDisplayField": "addressDisplay"
+  "linkDisplayField": "addressDisplay"
 }
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index 2ee7d547..93f41983 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -74,7 +74,7 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "inline": true
+      "create": true
     },
     {
       "fieldname": "taxId",
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index c534216f..c65cebdc 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -34,7 +34,6 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "inline": true,
       "create": true,
       "section": "Contacts"
     },
diff --git a/schemas/app/inventory/Location.json b/schemas/app/inventory/Location.json
index 45161032..2f257458 100644
--- a/schemas/app/inventory/Location.json
+++ b/schemas/app/inventory/Location.json
@@ -16,7 +16,7 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "inline": true
+      "create": true
     }
   ],
   "quickEditFields": ["item", "address"]
diff --git a/schemas/index.ts b/schemas/index.ts
index 46c8bb6a..eccd6b39 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -50,8 +50,8 @@ function removeFields(schemaMap: SchemaMap): SchemaMap {
         (fn) => fn !== fieldname
       );
 
-      if (schema.inlineEditDisplayField === fieldname) {
-        delete schema.inlineEditDisplayField;
+      if (schema.linkDisplayField === fieldname) {
+        delete schema.linkDisplayField;
       }
     }
 
diff --git a/schemas/tests/Party.json b/schemas/tests/Party.json
index b833ec4e..48726c81 100644
--- a/schemas/tests/Party.json
+++ b/schemas/tests/Party.json
@@ -72,8 +72,7 @@
       "fieldname": "address",
       "label": "Address",
       "fieldtype": "Link",
-      "target": "Address",
-      "inline": true
+      "target": "Address"
     }
   ],
   "quickEditFields": [
diff --git a/schemas/types.ts b/schemas/types.ts
index f542bdf3..7b505975 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -61,7 +61,6 @@ export interface BaseField {
   placeholder?: string;          // UI Facing config, form field placeholder
   groupBy?: string;              // UI Facing used in dropdowns fields
   meta?: boolean;                // Field is a meta field, i.e. only for the db, not UI
-  inline?: boolean;              // UI Facing config, whether to display doc inline.
   filter?: boolean;               // UI Facing config, whether to be used to filter the List.
   computed?: boolean;            // Computed values are not stored in the database.
   section?: string;              // UI Facing config, for grouping by sections
@@ -118,7 +117,7 @@ export interface Schema {
   isSubmittable?: boolean;       // For transactional types, values considered only after submit
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
-  inlineEditDisplayField?:string;// Display field if inline editable
+  linkDisplayField?:string;// Display field if inline editable
   naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
   titleField?: string;           // Main display field
   removeFields?: string[];       // Used by the builder to remove fields.
diff --git a/src/components/Controls/FormControl.vue b/src/components/Controls/FormControl.vue
index ad87c458..323430ca 100644
--- a/src/components/Controls/FormControl.vue
+++ b/src/components/Controls/FormControl.vue
@@ -48,6 +48,12 @@ export default {
     });
   },
   methods: {
+    clear() {
+      const input = this.$refs.control.$refs.input;
+      if (input instanceof HTMLInputElement) {
+        input.value = '';
+      }
+    },
     focus() {
       this.$refs.control.focus();
     },
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 640b6a65..15a518b7 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -35,7 +35,7 @@ export default {
 
       const value = newValue ?? this.value;
       const { fieldname, target } = this.df ?? {};
-      const displayField = fyo.schemaMap[target ?? '']?.inlineEditDisplayField;
+      const displayField = fyo.schemaMap[target ?? '']?.linkDisplayField;
 
       if (!displayField) {
         return (this.linkValue = value);
diff --git a/src/components/Controls/Select.vue b/src/components/Controls/Select.vue
index 087c04ba..67d6b5a2 100644
--- a/src/components/Controls/Select.vue
+++ b/src/components/Controls/Select.vue
@@ -23,7 +23,12 @@
         @change="(e) => triggerChange(e.target.value)"
         @focus="(e) => $emit('focus', e)"
       >
-        <option value="" disabled selected v-if="inputPlaceholder">
+        <option
+          value=""
+          disabled
+          selected
+          v-if="inputPlaceholder && !showLabel"
+        >
           {{ inputPlaceholder }}
         </option>
         <option
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 07a1d326..1394870a 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="text-sm" :class="{ 'border-t': !noBorder }">
+  <div class="text-sm border-t">
     <template v-for="df in formFields">
       <!-- Table Field Form (Eg: PaymentFor) -->
-      <FormControl
+      <Table
         v-if="df.fieldtype === 'Table'"
         :key="`${df.fieldname}-table`"
         ref="controls"
@@ -13,53 +13,13 @@
         :read-only="readOnly"
       />
 
-      <!-- Inline Field Form (Eg: Address) -->
-      <div
-        v-else-if="renderInline(df)"
-        class="border-b"
-        :key="`${df.fieldname}-inline`"
-      >
-        <TwoColumnForm
-          class="overflow-auto custom-scroll"
-          style="max-height: calc((var(--h-row-mid) + 1px) * 3 - 1px)"
-          ref="inlineEditForm"
-          :doc="inlineEditDoc"
-          :fields="getInlineEditFields(df)"
-          :column-ratio="columnRatio"
-          :no-border="true"
-          :focus-first-input="true"
-          :autosave="false"
-          :read-only="readOnly"
-          @error="(msg) => $emit('error', msg)"
-        />
-        <div
-          class="flex px-4 py-4 justify-between items-center"
-          style="max-height: calc(var(--h-row-mid) + 1px)"
-        >
-          <Button class="text-gray-900 w-20" @click="stopInlineEditing">
-            {{ t`Cancel` }}
-          </Button>
-          <Button
-            type="primary"
-            class="text-white w-20"
-            @click="saveInlineEditDoc(df)"
-          >
-            {{ t`Save` }}
-          </Button>
-        </div>
-      </div>
-
       <!-- Regular Field Form -->
       <div
         v-else
-        class="grid items-center"
-        :class="{
-          'border-b': !noBorder,
-        }"
+        class="grid items-center border-b"
         :key="`${df.fieldname}-regular`"
         :style="{
           ...style,
-
           height: getFieldHeight(df),
         }"
       >
@@ -69,7 +29,6 @@
 
         <div
           class="py-2 pe-4"
-          @click="activateInlineEditing(df)"
           :class="{
             'ps-2': df.fieldtype === 'AttachImage',
           }"
@@ -78,12 +37,11 @@
             ref="controls"
             size="small"
             :df="df"
-            :value="getRegularValue(df)"
+            :value="doc[df.fieldname]"
             :class="{ 'p-2': df.fieldtype === 'Check' }"
             :read-only="readOnly"
             :text-end="false"
             @change="async (value) => await onChange(df, value)"
-            @focus="activateInlineEditing(df)"
             @new-doc="async (newdoc) => await onChange(df, newdoc.name)"
           />
           <div
@@ -99,12 +57,12 @@
 </template>
 <script>
 import { Doc } from 'fyo/model/doc';
-import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import { handleErrorWithDialog } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import { getErrorMessage } from 'src/utils';
 import { evaluateHidden } from 'src/utils/doc';
+import Table from './Controls/Table.vue';
 
 export default {
   name: 'TwoColumnForm',
@@ -121,7 +79,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    noBorder: Boolean,
     focusFirstInput: Boolean,
     readOnly: { type: [null, Boolean], default: null },
   },
@@ -132,8 +89,6 @@ export default {
   },
   data() {
     return {
-      inlineEditDoc: null,
-      inlineEditField: null,
       formFields: [],
       errors: {},
     };
@@ -147,8 +102,7 @@ export default {
   },
   components: {
     FormControl,
-    Button,
-    TwoColumnForm: () => TwoColumnForm,
+    Table,
   },
   mounted() {
     this.setFormFields();
@@ -172,51 +126,25 @@ export default {
 
       return 'calc(var(--h-row-mid) + 1px)';
     },
-    getRegularValue(df) {
-      if (!df.inline) {
-        return this.doc[df.fieldname];
-      }
+    async onChange(field, value) {
+      const { fieldname } = field;
+      delete this.errors[fieldname];
 
-      const link = this.doc.getLink(df.fieldname);
-      if (!link) {
-        return this.doc[df.fieldname];
-      }
-
-      const fieldname = link.schema.inlineEditDisplayField ?? 'name';
-      return link[fieldname];
-    },
-    renderInline(df) {
-      return (
-        this.inlineEditField?.fieldname === df?.fieldname && this.inlineEditDoc
-      );
-    },
-    async onChange(df, value) {
-      if (df.inline) {
-        return;
-      }
-
-      // handle rename
-      if (this.autosave && df.fieldname === 'name' && this.doc.inserted) {
-        return this.doc.rename(value);
-      }
-
-      const oldValue = this.doc.get(df.fieldname);
-      this.errors[df.fieldname] = null;
-      await this.onChangeCommon(df, value, oldValue);
-    },
-    async onChangeCommon(df, value, oldValue) {
       let isSet = false;
+      const oldValue = this.doc.get(fieldname);
       try {
-        isSet = await this.doc.set(df.fieldname, value);
+        isSet = await this.doc.set(fieldname, value);
       } catch (err) {
-        this.errors[df.fieldname] = getErrorMessage(err, this.doc);
+        if (!(err instanceof Error)) {
+          return;
+        }
+
+        this.errors[fieldname] = getErrorMessage(err, this.doc);
       }
 
-      if (!isSet) {
-        return;
+      if (isSet) {
+        await this.handlePostSet(field, value, oldValue);
       }
-
-      await this.handlePostSet(df, value, oldValue);
     },
     async handlePostSet(df, value, oldValue) {
       this.setFormFields();
@@ -224,17 +152,16 @@ export default {
         this.$emit('change', df, value, oldValue);
       }
 
-      if (this.autosave && this.doc.dirty) {
-        if (df.fieldtype === 'Table') {
-          return;
-        }
-
-        await this.doc.sync();
+      if (df.fieldtype === 'Table' || !this.doc.dirty || !this.autosave) {
+        return;
       }
+
+      await this.doc.sync();
     },
     async sync() {
       try {
         await this.doc.sync();
+        this.setFormFields();
       } catch (err) {
         await handleErrorWithDialog(err, this.doc);
       }
@@ -242,57 +169,11 @@ export default {
     async submit() {
       try {
         await this.doc.submit();
+        this.setFormFields();
       } catch (err) {
         await handleErrorWithDialog(err, this.doc);
       }
     },
-    async activateInlineEditing(df) {
-      if (!df.inline) {
-        return;
-      }
-
-      this.inlineEditField = df;
-      if (!this.doc[df.fieldname]) {
-        this.inlineEditDoc = await fyo.doc.getNewDoc(df.target);
-      } else {
-        this.inlineEditDoc = this.doc.getLink(df.fieldname);
-      }
-    },
-    getInlineEditFields(df) {
-      const inlineEditFieldNames =
-        fyo.schemaMap[df.target].quickEditFields ?? [];
-      return inlineEditFieldNames.map((fieldname) =>
-        fyo.getField(df.target, fieldname)
-      );
-    },
-    async saveInlineEditDoc(df) {
-      if (!this.inlineEditDoc) {
-        return;
-      }
-
-      try {
-        await this.inlineEditDoc.sync();
-      } catch (error) {
-        return await handleErrorWithDialog(error, this.inlineEditDoc);
-      }
-
-      await this.onChangeCommon(df, this.inlineEditDoc.name);
-      await this.doc.loadLinks();
-
-      if (this.emitChange) {
-        this.$emit('change', this.inlineEditField);
-      }
-
-      await this.stopInlineEditing();
-    },
-    async stopInlineEditing() {
-      if (this.inlineEditDoc?.dirty && !this.inlineEditDoc?.notInserted) {
-        await this.inlineEditDoc.load();
-      }
-
-      this.inlineEditDoc = null;
-      this.inlineEditField = null;
-    },
     setFormFields() {
       let fieldList = this.fields;
 
diff --git a/src/pages/CommonForm/CommonFormSection.vue b/src/pages/CommonForm/CommonFormSection.vue
index 091f3c39..8b7a9cd4 100644
--- a/src/pages/CommonForm/CommonFormSection.vue
+++ b/src/pages/CommonForm/CommonFormSection.vue
@@ -66,15 +66,19 @@ export default defineComponent({
   methods: {
     focusOnNameField() {
       const naming = this.fyo.schemaMap[this.doc.schemaName]?.naming;
-      if (naming !== 'manual') {
+      if (naming !== 'manual' || this.doc.inserted) {
         return;
       }
 
-      const nameField = (this.$refs.nameField as { focus: Function }[])?.[0];
+      const nameField = (
+        this.$refs.nameField as { focus: Function; clear: Function }[]
+      )?.[0];
+
       if (!nameField) {
         return;
       }
 
+      nameField.clear();
       nameField.focus();
     },
   },
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
index bf5e9f7d..e8bab8cf 100644
--- a/src/utils/doc.ts
+++ b/src/utils/doc.ts
@@ -2,7 +2,14 @@ import { Doc } from 'fyo/model/doc';
 import { Field } from 'schemas/types';
 
 export function evaluateReadOnly(field: Field, doc?: Doc) {
-  if (field.fieldname === 'numberSeries' && !doc?.notInserted) {
+  if (doc?.inserted && field.fieldname === 'numberSeries') {
+    return true;
+  }
+
+  if (
+    field.fieldname === 'name' &&
+    (doc?.inserted || doc?.schema.naming !== 'manual')
+  ) {
     return true;
   }