diff --git a/spp_registrant_gis/views/res_partner_views.xml b/spp_registrant_gis/views/res_partner_views.xml
index 781d0b5f..5a258a56 100644
--- a/spp_registrant_gis/views/res_partner_views.xml
+++ b/spp_registrant_gis/views/res_partner_views.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <!-- Add coordinates field to Individual Profile tab -->
+    <!-- Add coordinates field to Individual Profile tab.
+         Location renders AFTER Financial Information so the profile order
+         is: Contact → Phones → Financial → Location (#942 item 1). -->
     <record id="view_individuals_form_gis" model="ir.ui.view">
         <field name="name">spp_registrant_gis.view_individuals_form_gis</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="spp_registry.view_individuals_form" />
         <field name="arch" type="xml">
-            <!-- Add GPS coordinates after phone numbers section -->
             <xpath
-                expr="//page[@name='profile']//group[@name='phone_section']"
+                expr="//page[@name='profile']//group[@name='financial_section']"
                 position="after"
             >
                 <separator string="Location" />
@@ -19,15 +20,15 @@
         </field>
     </record>
 
-    <!-- Add coordinates field to Group Profile tab -->
+    <!-- Add coordinates field to Group Profile tab.
+         Same ordering as the individual form. -->
     <record id="view_groups_form_gis" model="ir.ui.view">
         <field name="name">spp_registrant_gis.view_groups_form_gis</field>
         <field name="model">res.partner</field>
         <field name="inherit_id" ref="spp_registry.view_individuals_form" />
         <field name="arch" type="xml">
-            <!-- Add GPS coordinates after phone numbers section -->
             <xpath
-                expr="//page[@name='group_profile']//group[@name='group_phone_section']"
+                expr="//page[@name='group_profile']//group[@name='group_financial_section']"
                 position="after"
             >
                 <separator string="Location" />
diff --git a/spp_registry/models/group.py b/spp_registry/models/group.py
index 22a36a83..0bf71d47 100644
--- a/spp_registry/models/group.py
+++ b/spp_registry/models/group.py
@@ -52,6 +52,47 @@ def _compute_force_recompute_canary(self):
         "Group Members",
     )
 
+    # True when the group-membership-type vocabulary has at least one code.
+    # Used by views to hide the "Group Role" column entirely when the
+    # vocabulary is empty (otherwise the column shows blank tag cells with
+    # nothing pickable).
+    has_group_membership_type_codes = fields.Boolean(
+        compute="_compute_has_group_membership_type_codes",
+    )
+
+    # True when the group-type vocabulary has at least one code. Used to
+    # hide the Group Type form field when there's nothing to pick.
+    has_group_type_codes = fields.Boolean(
+        compute="_compute_has_group_type_codes",
+    )
+
+    def _compute_has_group_membership_type_codes(self):
+        # sudo() so non-admin readers can still resolve the column-visibility
+        # flag; we only return a boolean, no vocabulary content leaks.
+        has_codes = bool(
+            self.env["spp.vocabulary.code"]  # nosemgrep: odoo-sudo-without-context
+            .sudo()
+            .search_count(
+                [("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:group-membership-type")],
+                limit=1,
+            )
+        )
+        for rec in self:
+            rec.has_group_membership_type_codes = has_codes
+
+    def _compute_has_group_type_codes(self):
+        # sudo(): same rationale as above — we only expose a boolean.
+        has_codes = bool(
+            self.env["spp.vocabulary.code"]  # nosemgrep: odoo-sudo-without-context
+            .sudo()
+            .search_count(
+                [("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:group-type")],
+                limit=1,
+            )
+        )
+        for rec in self:
+            rec.has_group_type_codes = has_codes
+
     def write(self, values):
         res = super().write(values)
         self._validate_unique_membership_types()
diff --git a/spp_registry/models/group_membership.py b/spp_registry/models/group_membership.py
index a1170fc2..467170fd 100644
--- a/spp_registry/models/group_membership.py
+++ b/spp_registry/models/group_membership.py
@@ -27,9 +27,29 @@ class SPPGroupMembership(models.Model):
     )
     membership_type_ids = fields.Many2many(
         "spp.vocabulary.code",
-        string="Membership Types",
+        string="Group Role",
         domain="[('namespace_uri', '=', 'urn:openspp:vocab:group-membership-type')]",
     )
+    # True when the group-membership-type vocabulary has at least one code.
+    # Drives column_invisible on the standalone Group Membership tree view
+    # (the embedded lists on the registrant forms read this from
+    # `parent.has_group_membership_type_codes` on res.partner instead).
+    has_group_membership_type_codes = fields.Boolean(
+        compute="_compute_has_group_membership_type_codes",
+    )
+
+    def _compute_has_group_membership_type_codes(self):
+        has_codes = bool(
+            self.env["spp.vocabulary.code"]  # nosemgrep: odoo-sudo-without-context
+            .sudo()
+            .search_count(
+                [("vocabulary_id.namespace_uri", "=", "urn:openspp:vocab:group-membership-type")],
+                limit=1,
+            )
+        )
+        for rec in self:
+            rec.has_group_membership_type_codes = has_codes
+
     start_date = fields.Datetime(default=lambda self: fields.Datetime.now())
     ended_date = fields.Datetime()
     status = fields.Selection(
diff --git a/spp_registry/views/group_membership_view.xml b/spp_registry/views/group_membership_view.xml
index a1cc189a..62cbca63 100644
--- a/spp_registry/views/group_membership_view.xml
+++ b/spp_registry/views/group_membership_view.xml
@@ -9,13 +9,15 @@
         <field name="priority">1</field>
         <field name="arch" type="xml">
             <list>
+                <field name="has_group_membership_type_codes" column_invisible="1" />
                 <field name="group" />
                 <field name="individual" />
                 <field
                     name="membership_type_ids"
-                    string="Membership Types"
+                    string="Group Role"
                     widget="many2many_tags"
                     options="{'no_create_edit':True,'no_open':True}"
+                    column_invisible="not has_group_membership_type_codes"
                 />
                 <field name="start_date" />
                 <field name="ended_date" />
@@ -52,10 +54,7 @@
                             />
                         </h1>
                         <div class="o_row">
-                            <label
-                                for="membership_type_ids"
-                                string="Membership Types:"
-                            />
+                            <label for="membership_type_ids" string="Group Role:" />
                             <field
                                 name="membership_type_ids"
                                 widget="many2many_tags"
diff --git a/spp_registry/views/group_membership_views.xml b/spp_registry/views/group_membership_views.xml
index aa47d412..2e9a1787 100644
--- a/spp_registry/views/group_membership_views.xml
+++ b/spp_registry/views/group_membership_views.xml
@@ -14,6 +14,7 @@
             </xpath>
             <xpath expr="//div[@name='group_members_section']" position="inside">
                 <separator string="Group Members" />
+                <field name="has_group_membership_type_codes" invisible="1" />
                 <field name="group_membership_ids" readonly="disabled" nolabel="1">
                     <list editable="top" default_order='status asc,ended_date asc'>
                         <button
@@ -34,9 +35,10 @@
                         <field name="individual_gender" string="Sex" />
                         <field
                             name="membership_type_ids"
-                            string="Membership Types"
+                            string="Group Role"
                             widget="many2many_tags"
                             options="{'no_open':True, 'no_create_edit':True, 'no_create':True, 'no_quick_create':True}"
+                            column_invisible="not parent.has_group_membership_type_codes"
                         />
                         <field name="start_date" />
                         <field name="ended_date" string="End date" />
diff --git a/spp_registry/views/individual_membership_views.xml b/spp_registry/views/individual_membership_views.xml
index d0378842..6ea4747d 100644
--- a/spp_registry/views/individual_membership_views.xml
+++ b/spp_registry/views/individual_membership_views.xml
@@ -14,6 +14,7 @@
             </xpath>
             <xpath expr="//div[@name='membership_section']" position="inside">
                 <separator string="Group Membership" />
+                <field name="has_group_membership_type_codes" invisible="1" />
                 <field name="individual_membership_ids" readonly="disabled" nolabel="1">
                     <list editable="top">
                         <button
@@ -32,9 +33,10 @@
                         />
                         <field
                             name="membership_type_ids"
-                            string="Membership Types"
+                            string="Group Role"
                             widget="many2many_tags"
                             options="{'no_open':True, 'no_create_edit':True}"
+                            column_invisible="not parent.has_group_membership_type_codes"
                         />
                         <field name="start_date" />
                         <field name="ended_date" />
diff --git a/spp_registry/views/individual_views.xml b/spp_registry/views/individual_views.xml
index 2f62a335..67dedc64 100644
--- a/spp_registry/views/individual_views.xml
+++ b/spp_registry/views/individual_views.xml
@@ -582,11 +582,16 @@
                                                 readonly="disabled"
                                                 help="Name of the group (e.g., Household, Family)"
                                             />
+                                            <field
+                                                name="has_group_type_codes"
+                                                invisible="1"
+                                            />
                                             <field
                                                 name="group_type_id"
                                                 string="Group Type"
                                                 options="{'no_open':True, 'no_create_edit':True,'no_create':True}"
                                                 readonly="disabled"
+                                                invisible="not has_group_type_codes"
                                                 help="Type of group classification"
                                             />
                                         </group>
diff --git a/spp_registry_group_hierarchy/views/group_views.xml b/spp_registry_group_hierarchy/views/group_views.xml
index d4388493..8170fe47 100644
--- a/spp_registry_group_hierarchy/views/group_views.xml
+++ b/spp_registry_group_hierarchy/views/group_views.xml
@@ -63,7 +63,7 @@
                                 />
                             </h1>
                             <div class="o_row">
-                                <label for="membership_type_ids" string="Role:" />
+                                <label for="membership_type_ids" string="Group Role:" />
                                 <field
                                     name="membership_type_ids"
                                     widget="many2many_tags"