diff --git a/custom_ui/custom_fields.py b/custom_ui/custom_fields.py
index 2074d1f..a65c9f3 100644
--- a/custom_ui/custom_fields.py
+++ b/custom_ui/custom_fields.py
@@ -382,6 +382,12 @@ custom_fields = {
         )
     ],
     "Quotation": [
+        dict(
+            fieldname="custom_installation_address",
+            label="Installation Address",
+            fieldtype="Link",
+            options="Address"
+        ),
         dict(
             fieldname="requires_half_payment",
             label="Requires Half Payment",
@@ -389,20 +395,12 @@ custom_fields = {
             default=0,
             insert_after="custom_installation_address"
         ),
-        dict(
-            fieldname="custom_quotation_template",
-            label="Quotation Template",
-            fieldtype="Link",
-            options="Quotation Template",
-            insert_after="company",
-            description="The template used for generating this quotation."
-        ),
         dict(
             fieldname="custom_project_template",
             label="Project Template",
             fieldtype="Link",
             options="Project Template",
-            insert_after="custom_quotation_template",
+            insert_after="requires_half_payment",
             description="The project template to use when creating a project from this quotation.",
             allow_on_submit=1
         ),
@@ -422,13 +420,6 @@ custom_fields = {
             options="On-Site Meeting",
             insert_after="custom_job_address"
         ),
-        dict(
-            fieldname="from_onsite_meeting",
-            label="From On-Site Meeting",
-            fieldtype="Link",
-            options="On-Site Meeting",
-            insert_after="custom_job_address"
-        ),
         dict(
             fieldname="actual_customer_name",
             label="Customer",
@@ -444,9 +435,39 @@ custom_fields = {
             options="Customer\nLead",
             insert_after="customer_name",
             allow_on_submit=1
-        )
+        ),
+        dict(
+            fieldname="custom_current_status",
+            label="Status",
+            fieldtype="Select",
+            options="Draft\nSubmitted\nEstimate Accepted\nLost\nWon",
+            insert_after="Date",
+            allow_on_submit=1
+        ),
+        dict(
+            fieldname="custom_sent",
+            label="Sent",
+            fieldtype="Check",
+            insert_after="custom_current_status",
+            default=0,
+            allow_on_submit=1
+        ),
+        dict(
+            fieldname="custom_followup_needed",
+            label="Follow-up Needed",
+            fieldtype="Check",
+            insert_after="custom_sent",
+            default=0,
+            allow_on_submit=1
+        ),
     ],
     "Sales Order": [
+        dict(
+            fieldname="custom_installation_address",
+            label="Installation Address",
+            fieldtype="Link",
+            options="Address"
+        ),
         dict(
             fieldname="requires_half_payment",
             label="Requires Half Payment",
@@ -471,7 +492,14 @@ custom_fields = {
             insert_after="custom_installation_address",
             description="The address where the job will be performed.",
             allow_on_submit=1
-        )
+        ),
+        dict(
+            fieldname="custom_department_type",
+            label="Department Type",
+            fieldtype="Select",
+            options="\nFencing Install\nWarranty\nSprinkler Service\nLandscape Installation\nLawn Maintenance",
+            insert_after="delivery_date",
+        ),
     ],
     "Project": [
         dict(
@@ -581,5 +609,13 @@ custom_fields = {
             options="Project Template",
             insert_after="project"
         )
+    ],
+    "Territory": [
+        dict(
+            fieldname="custom_map",
+            label="Map",
+            fieldtype="Attach Image",
+            insert_after="is_group"
+        )
     ]
 }