diff --git a/apps/admin-new/src/layout/DaoContainer.tsx b/apps/admin-new/src/layout/DaoContainer.tsx
index cdba097a..2e0466c0 100644
--- a/apps/admin-new/src/layout/DaoContainer.tsx
+++ b/apps/admin-new/src/layout/DaoContainer.tsx
@@ -3,6 +3,7 @@ import { Outlet, useLocation, useParams } from 'react-router-dom';
 import { CurrentDaoProvider, useDaoData } from '@daohaus/moloch-v3-hooks';
 import { ValidNetwork } from '@daohaus/keychain-utils';
 import { TXBuilder } from '@daohaus/tx-builder';
+import { Footer } from '@daohaus/ui';
 
 export const DaoContainer = () => {
   const { address, provider } = useDHConnect();
@@ -48,6 +49,7 @@ export const DaoContainer = () => {
         pathname={location.pathname}
         navLinks={navLinks}
         dropdownLinks={moreLinks}
+        footer={<Footer />}
       >
         <CurrentDaoProvider
           userAddress={address}
diff --git a/apps/admin-new/src/layout/HomeContainer.tsx b/apps/admin-new/src/layout/HomeContainer.tsx
index 78ff0d78..be73ad39 100644
--- a/apps/admin-new/src/layout/HomeContainer.tsx
+++ b/apps/admin-new/src/layout/HomeContainer.tsx
@@ -1,4 +1,5 @@
 import { DHLayout } from '@daohaus/connect';
+import { Footer } from '@daohaus/ui';
 import { Outlet, useLocation } from 'react-router-dom';
 
 export const HomeContainer = () => {
@@ -19,6 +20,7 @@ export const HomeContainer = () => {
       // }
       pathname={location.pathname}
       navLinks={[{ label: 'Hub', href: `/` }]}
+      footer={<Footer />}
     >
       <Outlet />
     </DHLayout>
diff --git a/apps/admin-new/src/pages/FormTest.tsx b/apps/admin-new/src/pages/FormTest.tsx
index d0b9735d..afccdd97 100644
--- a/apps/admin-new/src/pages/FormTest.tsx
+++ b/apps/admin-new/src/pages/FormTest.tsx
@@ -1,13 +1,13 @@
 import { FormBuilder } from '@daohaus/form-builder';
 import { useCurrentDao } from '@daohaus/moloch-v3-hooks';
-import { COMMON_FORMS } from '@daohaus/moloch-v3-legos';
+import { PROPOSAL_FORMS } from '@daohaus/moloch-v3-legos';
 import { MolochFields } from '@daohaus/moloch-v3-fields';
 
 export const FormTest = () => {
   const { daoChain } = useCurrentDao();
   return (
     <FormBuilder
-      form={COMMON_FORMS.ADD_SAFE}
+      form={PROPOSAL_FORMS.SIGNAL}
       targetNetwork={daoChain}
       customFields={MolochFields}
     />
diff --git a/apps/admin-new/src/pages/Settings.tsx b/apps/admin-new/src/pages/Settings.tsx
index dc1dbbde..aa89334a 100644
--- a/apps/admin-new/src/pages/Settings.tsx
+++ b/apps/admin-new/src/pages/Settings.tsx
@@ -16,6 +16,11 @@ export const Settings = () => {
           daoId={dao.id}
           includeLinks={true}
         />
+        // <GovernanceSettings
+        //   daoChain={daoChain as keyof Keychain}
+        //   dao={dao}
+        //   includeLinks={true}
+        // />
       )}
     </SingleColumnLayout>
   );
diff --git a/apps/admin/src/Routes.tsx b/apps/admin/src/Routes.tsx
index 3cf328b0..d1657a4a 100644
--- a/apps/admin/src/Routes.tsx
+++ b/apps/admin/src/Routes.tsx
@@ -23,6 +23,7 @@ import RageQuit from './pages/RageQuit';
 import { DHLayout, useDHConnect } from '@daohaus/connect';
 import { HeaderAvatar } from './components/HeaderAvatar';
 import { ReactSetter } from '@daohaus/utils';
+import { Footer } from '@daohaus/ui';
 
 const Routes = ({
   setDaoChainId,
@@ -83,6 +84,7 @@ const HomeContainer = () => {
       }
       pathname={location.pathname}
       navLinks={[{ label: 'Hub', href: `/` }]}
+      footer={<Footer />}
     >
       <Outlet />
     </DHLayout>
diff --git a/apps/admin/src/pages/Dao.tsx b/apps/admin/src/pages/Dao.tsx
index ccb3fe77..c6c69ba3 100644
--- a/apps/admin/src/pages/Dao.tsx
+++ b/apps/admin/src/pages/Dao.tsx
@@ -4,6 +4,7 @@ import { useConnectedMember, useDao } from '@daohaus/moloch-v3-context';
 import { TXBuilder } from '@daohaus/tx-builder';
 import { useMemo } from 'react';
 import { HeaderAvatar } from '../components/HeaderAvatar';
+import { Footer } from '@daohaus/ui';
 
 export function Dao() {
   const { daochain, daoid } = useParams();
@@ -72,6 +73,7 @@ export function Dao() {
           },
         ]}
         dropdownLinks={moreLinks}
+        footer={<Footer />}
       >
         <Outlet />
       </DHLayout>
diff --git a/apps/moloch-v3-subgraph/schema.graphql b/apps/moloch-v3-subgraph/schema.graphql
index d5fef8d0..a178d4e0 100644
--- a/apps/moloch-v3-subgraph/schema.graphql
+++ b/apps/moloch-v3-subgraph/schema.graphql
@@ -171,10 +171,12 @@ type Proposal @entity {
   currentlyPassing: Boolean!
   "highest share+loot count during any individual yes vote"
   maxTotalSharesAndLootAtYesVote: BigInt!
-  "Snapshot of the quorum precent for the DAO when the proposal was executed"
-  quorumPercentAtExecution: BigInt
-  "Snapshot of the total shares for the DAO when the proposal was executed"
-  totalSharesAtExecution: BigInt
+  "highest share count during any individual yes vote"
+  maxTotalSharesAtYesVote: BigInt!
+  "Snapshot of the quorum precent for the DAO when the proposal was sponsored"
+  quorumPercentAtSponsor: BigInt
+  "the block number when the proposal was executed"
+  blockNumberAtExecution: BigInt
   "The following tribute fields will only have values if the proposal was submitted through the trbute minion contract. \n token address in tribute proposals."
   tributeToken: Bytes
   "amount of tribute token offered"
diff --git a/apps/moloch-v3-subgraph/src/baal-mapping.ts b/apps/moloch-v3-subgraph/src/baal-mapping.ts
index 75c0db85..c98596ad 100644
--- a/apps/moloch-v3-subgraph/src/baal-mapping.ts
+++ b/apps/moloch-v3-subgraph/src/baal-mapping.ts
@@ -192,6 +192,7 @@ export function handleSubmitProposal(event: SubmitProposal): void {
   proposal.currentlyPassing = false;
   proposal.proposalOffering = event.transaction.value;
   proposal.maxTotalSharesAndLootAtYesVote = constants.BIGINT_ZERO;
+  proposal.maxTotalSharesAtYesVote = constants.BIGINT_ZERO;
   proposal.sponsored = event.params.selfSponsor;
   proposal.selfSponsor = event.params.selfSponsor;
   proposal.sponsorTxHash = event.params.selfSponsor
@@ -202,6 +203,9 @@ export function handleSubmitProposal(event: SubmitProposal): void {
     : null;
   proposal.sponsor = event.params.selfSponsor ? event.transaction.from : null;
   proposal.sponsorMembership = event.params.selfSponsor ? proposerId : null;
+  proposal.quorumPercentAtSponsor = event.params.selfSponsor
+    ? dao.totalShares
+    : null;
   proposal.prevProposalId = event.params.selfSponsor
     ? dao.latestSponsoredProposalId
     : constants.BIGINT_ZERO;
@@ -299,6 +303,7 @@ export function handleSponsorProposal(event: SponsorProposal): void {
   proposal.prevProposalId = dao.latestSponsoredProposalId;
   proposal.sponsorTxHash = event.transaction.hash;
   proposal.sponsorTxAt = event.block.timestamp;
+  proposal.quorumPercentAtSponsor = dao.totalShares;
 
   dao.latestSponsoredProposalId = event.params.proposal;
 
@@ -330,8 +335,7 @@ export function handleProcessProposal(event: ProcessProposal): void {
   proposal.processed = true;
   proposal.passed = event.params.passed;
   proposal.actionFailed = event.params.actionFailed;
-  proposal.quorumPercentAtExecution = dao.quorumPercent;
-  proposal.totalSharesAtExecution = dao.totalShares;
+  proposal.blockNumberAtExecution = event.block.number;
 
   proposal.save();
 
@@ -403,6 +407,7 @@ export function handleSubmitVote(event: SubmitVote): void {
     proposal.maxTotalSharesAndLootAtYesVote = dao.totalShares.plus(
       dao.totalLoot
     );
+    proposal.maxTotalSharesAtYesVote = dao.totalShares;
   } else {
     proposal.noVotes = proposal.noVotes.plus(constants.BIGINT_ONE);
     proposal.noBalance = proposal.noBalance.plus(event.params.balance);
diff --git a/libs/connect/src/components/DHLayout/DHLayout.tsx b/libs/connect/src/components/DHLayout/DHLayout.tsx
index 215a8819..fe8c4327 100644
--- a/libs/connect/src/components/DHLayout/DHLayout.tsx
+++ b/libs/connect/src/components/DHLayout/DHLayout.tsx
@@ -1,7 +1,7 @@
 import { ComponentProps, ReactNode } from 'react';
 
 import { DaoHausNav, DaoHausNavMenu } from '../DaoHausNav/DaoHausNav';
-import { AppSwitcher, Footer, MainLayout, widthQuery } from '@daohaus/ui';
+import { AppSwitcher, MainLayout, widthQuery } from '@daohaus/ui';
 import { OuterLayout } from '@daohaus/ui';
 import styled from 'styled-components';
 import { DaoHausNavProps } from '../DaoHausNav/DaoHausNav.types';
@@ -29,11 +29,13 @@ export const DHLayout = ({
   appNavLinks,
   leftNav,
   pathname,
+  footer,
 }: DaoHausNavProps & {
   children: ReactNode;
   leftNav?: ReactNode;
   appNavLinks?: ComponentProps<typeof AppSwitcher>;
   pathname: string;
+  footer?: ReactNode;
 }) => {
   return (
     <OuterLayout>
@@ -50,7 +52,7 @@ export const DHLayout = ({
         pathname={pathname}
       />
       <MainLayout>{children}</MainLayout>
-      <Footer />
+      {footer}
     </OuterLayout>
   );
 };
diff --git a/libs/form-builder-base/src/components/FormBuilderFactory.tsx b/libs/form-builder-base/src/components/FormBuilderFactory.tsx
index 46774591..9b62f48d 100644
--- a/libs/form-builder-base/src/components/FormBuilderFactory.tsx
+++ b/libs/form-builder-base/src/components/FormBuilderFactory.tsx
@@ -12,8 +12,14 @@ export const FormBuilderFactory = ({ field }: { field: FieldLego }) => {
     formState: { errors },
   } = useFormContext();
   const formState = errors;
-  const { formDisabled, requiredFields, fieldObj, fieldSpacing, applyToEach } =
-    useFormBuilder();
+  const {
+    formDisabled,
+    requiredFields,
+    fieldObj,
+    fieldSpacing,
+    applyToEach,
+    submitDisabled,
+  } = useFormBuilder();
 
   const GeneratedField = useMemo(
     () => {
@@ -24,11 +30,12 @@ export const FormBuilderFactory = ({ field }: { field: FieldLego }) => {
         field: field,
         requiredFields: requiredFields || {},
       });
+
       return (
         <Field
           {...field}
           rules={newRules}
-          disabled={formDisabled || field.disabled}
+          disabled={formDisabled || field.disabled || submitDisabled}
           {...applyToEach}
         />
       );
@@ -37,7 +44,15 @@ export const FormBuilderFactory = ({ field }: { field: FieldLego }) => {
     // formState change
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [type, formDisabled, field, requiredFields, fieldObj, formState]
+    [
+      type,
+      formDisabled,
+      field,
+      requiredFields,
+      fieldObj,
+      formState,
+      submitDisabled,
+    ]
   );
 
   return <Spacer fieldSpacing={fieldSpacing}>{GeneratedField}</Spacer>;
diff --git a/libs/form-builder/src/FormBuilder.tsx b/libs/form-builder/src/FormBuilder.tsx
index 6672d797..77e0651f 100644
--- a/libs/form-builder/src/FormBuilder.tsx
+++ b/libs/form-builder/src/FormBuilder.tsx
@@ -81,6 +81,7 @@ export const FormBuilder = ({
               error,
               fallback: 'Could not decode error message',
             });
+
             setIsLoading(false);
             lifeCycleFns?.onTxError?.(error);
             errorToast({ title: StatusMsg.TxErr, description: errMsg });
diff --git a/libs/moloch-v3-fields/src/fields/ProposalOffering.tsx b/libs/moloch-v3-fields/src/fields/ProposalOffering.tsx
index 8e1df45f..8c8577e0 100644
--- a/libs/moloch-v3-fields/src/fields/ProposalOffering.tsx
+++ b/libs/moloch-v3-fields/src/fields/ProposalOffering.tsx
@@ -27,7 +27,10 @@ export const ProposalOffering = (props: Buildable<{ id?: string }>) => {
   useEffect(() => {
     if (!dao || !id) return;
 
-    if (!connectedMember || Number(dao.sponsorThreshold) > Number(connectedMember.shares)) {
+    if (
+      !connectedMember ||
+      Number(dao.sponsorThreshold) > Number(connectedMember.shares)
+    ) {
       setRequiresOffering(true);
       setValue(id, dao.proposalOffering);
       return;
diff --git a/libs/moloch-v3-fields/src/fields/RequestERC20.tsx b/libs/moloch-v3-fields/src/fields/RequestERC20.tsx
index ab064b1d..1c1c22fa 100644
--- a/libs/moloch-v3-fields/src/fields/RequestERC20.tsx
+++ b/libs/moloch-v3-fields/src/fields/RequestERC20.tsx
@@ -99,7 +99,6 @@ export const RequestERC20 = (
     <WrappedInputSelect
       {...props}
       id={amtId}
-      label="Request ERC-20"
       defaultValue="0"
       selectId={addressId}
       selectPlaceholder="--"
diff --git a/libs/moloch-v3-fields/src/fields/TributeInput.tsx b/libs/moloch-v3-fields/src/fields/TributeInput.tsx
index 2ac7fe6f..20ffac24 100644
--- a/libs/moloch-v3-fields/src/fields/TributeInput.tsx
+++ b/libs/moloch-v3-fields/src/fields/TributeInput.tsx
@@ -193,7 +193,7 @@ export const TributeInput = (
       <FieldSpacer>
         <WrappedInput
           full
-          label="Token Address"
+          label="Tribute Token Address"
           id={addressId}
           helperText={fetchState}
           success={tokenName}
@@ -212,7 +212,7 @@ export const TributeInput = (
       <FieldSpacer>
         <WrappedInput
           full
-          label="Token Amount"
+          label="Tribute Token Amount"
           id={amtId}
           disabled={needsApproval}
           rules={tokenAmtRules}
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/ContractSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/ContractSettings.tsx
index 6c269f42..ccbddc10 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/ContractSettings.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/ContractSettings.tsx
@@ -8,7 +8,11 @@ import {
 import { Keychain, ValidNetwork } from '@daohaus/keychain-utils';
 import { MolochV3Dao } from '@daohaus/moloch-v3-data';
 
-import { MetaCardHeader, MetaContent } from './DaoSettings.styles';
+import {
+  MetaCardHeader,
+  MetaContent,
+  SettingsContainer,
+} from './DaoSettings.styles';
 
 type ContractSettingsProps = {
   dao: MolochV3Dao;
@@ -19,7 +23,7 @@ export const ContractSettings = ({ dao, daoChain }: ContractSettingsProps) => {
   const isMobile = useBreakpoint(widthQuery.sm);
 
   return (
-    <>
+    <SettingsContainer>
       <MetaCardHeader>
         <H3>Contracts</H3>
       </MetaCardHeader>
@@ -61,6 +65,6 @@ export const ContractSettings = ({ dao, daoChain }: ContractSettingsProps) => {
           />
         </div>
       </MetaContent>
-    </>
+    </SettingsContainer>
   );
 };
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/DaoSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/DaoSettings.tsx
index 01aed5f3..c3508f41 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/DaoSettings.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/DaoSettings.tsx
@@ -6,7 +6,7 @@ import { ContractSettings } from './ContractSettings';
 import { GovernanceSettings } from './GovernanceSettings';
 import { ShamanSettings } from './ShamanSettings';
 
-import { SettingsContainer } from './DaoSettings.styles';
+import { TokenSettings } from './TokenSettings';
 
 type DaoSettingsProps = {
   daoChain: ValidNetwork;
@@ -31,33 +31,31 @@ export const DaoSettings = ({
 
   return (
     <>
-      <SettingsContainer>
-        <MetadataSettings
-          dao={dao}
-          daoChain={daoChain}
-          includeLinks={includeLinks}
-        />
-      </SettingsContainer>
-
-      <SettingsContainer>
-        <ContractSettings dao={dao} daoChain={daoChain} />
-      </SettingsContainer>
-
-      <SettingsContainer>
-        <GovernanceSettings
-          dao={dao}
-          daoChain={daoChain}
-          includeLinks={includeLinks}
-        />
-      </SettingsContainer>
-
-      <SettingsContainer>
-        <ShamanSettings
-          dao={dao}
-          daoChain={daoChain}
-          includeLinks={includeLinks}
-        />
-      </SettingsContainer>
+      <MetadataSettings
+        dao={dao}
+        daoChain={daoChain}
+        includeLinks={includeLinks}
+      />
+
+      <ContractSettings dao={dao} daoChain={daoChain} />
+
+      <GovernanceSettings
+        dao={dao}
+        daoChain={daoChain}
+        includeLinks={includeLinks}
+      />
+
+      <TokenSettings
+        dao={dao}
+        daoChain={daoChain}
+        includeLinks={includeLinks}
+      />
+
+      <ShamanSettings
+        dao={dao}
+        daoChain={daoChain}
+        includeLinks={includeLinks}
+      />
     </>
   );
 };
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/GovernanceSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/GovernanceSettings.tsx
index d0444a6b..e96e5354 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/GovernanceSettings.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/GovernanceSettings.tsx
@@ -1,13 +1,11 @@
 import { useMemo } from 'react';
-import { H3, H4, DataIndicator, ParSm } from '@daohaus/ui';
+import { H3, DataIndicator, ParSm } from '@daohaus/ui';
 import { MolochV3Dao } from '@daohaus/moloch-v3-data';
 import {
-  charLimit,
   formatPeriods,
   formatValueTo,
   fromWei,
   INFO_COPY,
-  lowerCaseLootToken,
   toWholeUnits,
 } from '@daohaus/utils';
 
@@ -16,9 +14,8 @@ import {
   DataGrid,
   GovernanceCardHeader,
   GovernanceContainer,
+  SettingsContainer,
   StyledLink,
-  TokenDataGrid,
-  TokensHeader,
 } from './DaoSettings.styles';
 import { ButtonRouterLink } from '../Layout';
 
@@ -55,139 +52,83 @@ export const GovernanceSettings = ({
   }, [dao]);
 
   return (
-    <GovernanceContainer>
-      <GovernanceCardHeader>
-        <H3>Governance Settings</H3>
-        {includeLinks && (
-          <ButtonRouterLink
-            color="secondary"
-            to={`/molochv3/${daoChain}/${
-              dao.id
-            }/new-proposal?formLego=UPDATE_GOV_SETTINGS&defaultValues=${JSON.stringify(
-              defaultValues
-            )}`}
-          >
-            Update DAO Settings
-          </ButtonRouterLink>
-        )}
-      </GovernanceCardHeader>
-      <div className="description">
-        <ParSm>
-          <StyledLink
-            href="https://moloch.daohaus.fun/configuration/governance-configuration"
-            target="_blank"
-            rel="noreferrer"
-          >
-            Review the documenation
-          </StyledLink>{' '}
-          for additional details on governance settings. Updates to settings
-          will go through a proposal.
-        </ParSm>
-      </div>
-      <DataGrid>
-        <DataIndicator
-          size="sm"
-          label="Voting Period"
-          data={formatPeriods(dao.votingPeriod)}
-          info={INFO_COPY.VOTING_PERIOD}
-        />
-        <DataIndicator
-          size="sm"
-          label="Grace Period"
-          data={formatPeriods(dao.gracePeriod)}
-          info={INFO_COPY.GRACE_PERIOD}
-        />
-        <DataIndicator
-          size="sm"
-          label="New Offering"
-          data={`${fromWei(dao.proposalOffering)} ${networkData?.symbol}`}
-          info={INFO_COPY.NEW_OFFERING}
-        />
-      </DataGrid>
-      <DataGrid>
-        <DataIndicator
-          size="sm"
-          label="Quorum %"
-          data={formatValueTo({ value: dao.quorumPercent, format: 'percent' })}
-          info={INFO_COPY.QUORUM}
-        />
-        <DataIndicator
-          size="sm"
-          label="Min Retention %"
-          data={formatValueTo({
-            value: dao.minRetentionPercent,
-            format: 'percent',
-          })}
-          info={INFO_COPY.MIN_RETENTION}
-        />
-        <DataIndicator
-          size="sm"
-          label="Sponsor Threshold"
-          data={`${fromWei(dao.sponsorThreshold)} Voting Tokens`}
-          info={INFO_COPY.SPONSOR_THRESHOLD}
-        />
-      </DataGrid>
-      <TokensHeader>
-        <H3 className="tokens">DAO Tokens</H3>
-        {includeLinks && (
-          <ButtonRouterLink
-            color="secondary"
-            to={`/molochv3/${daoChain}/${
-              dao.id
-            }/new-proposal?formLego=TOKEN_SETTINGS&defaultValues=${JSON.stringify(
-              defaultValues
-            )}`}
-          >
-            Update Token Settings
-          </ButtonRouterLink>
-        )}
-      </TokensHeader>
-      <H4>Voting</H4>
-      <TokenDataGrid>
-        <DataIndicator
-          size="sm"
-          label="Total"
-          data={formatValueTo({
-            value: fromWei(dao.totalShares),
-            decimals: 2,
-            format: 'number',
-          })}
-        />
-        <DataIndicator size="sm" label="Symbol" data={dao.shareTokenSymbol} />
-        <DataIndicator
-          size="sm"
-          label="Name"
-          data={charLimit(dao.shareTokenName, 12)}
-        />
-        <DataIndicator
-          size="sm"
-          label="Transferability"
-          data={dao.sharesPaused ? 'Off' : 'On'}
-        />
-      </TokenDataGrid>
-      <H4>Non-Voting</H4>
-      <TokenDataGrid>
-        <DataIndicator
-          size="sm"
-          label="Total"
-          data={formatValueTo({
-            value: fromWei(dao.totalLoot),
-            decimals: 2,
-            format: 'number',
-          })}
-        />
-        <DataIndicator size="sm" label="Symbol" data={dao.lootTokenSymbol} />
-        <DataIndicator
-          size="sm"
-          label="Name"
-          data={charLimit(lowerCaseLootToken(dao.lootTokenName), 12)}
-        />
-        <DataIndicator
-          size="sm"
-          label="Transferability"
-          data={dao.lootPaused ? 'Off' : 'On'}
-        />
-      </TokenDataGrid>
-    </GovernanceContainer>
+    <SettingsContainer>
+      <GovernanceContainer>
+        <GovernanceCardHeader>
+          <H3>Governance Settings</H3>
+          {includeLinks && (
+            <ButtonRouterLink
+              color="secondary"
+              to={`/molochv3/${daoChain}/${
+                dao.id
+              }/new-proposal?formLego=UPDATE_GOV_SETTINGS&defaultValues=${JSON.stringify(
+                defaultValues
+              )}`}
+            >
+              Update Governance
+            </ButtonRouterLink>
+          )}
+        </GovernanceCardHeader>
+        <div className="description">
+          <ParSm>
+            <StyledLink
+              href="https://moloch.daohaus.fun/configuration/governance-configuration"
+              target="_blank"
+              rel="noreferrer"
+            >
+              Review the documenation
+            </StyledLink>{' '}
+            for additional details on governance settings. Updates to settings
+            will go through a proposal.
+          </ParSm>
+        </div>
+        <DataGrid>
+          <DataIndicator
+            size="sm"
+            label="Voting Period"
+            data={formatPeriods(dao.votingPeriod)}
+            info={INFO_COPY.VOTING_PERIOD}
+          />
+          <DataIndicator
+            size="sm"
+            label="Grace Period"
+            data={formatPeriods(dao.gracePeriod)}
+            info={INFO_COPY.GRACE_PERIOD}
+          />
+          <DataIndicator
+            size="sm"
+            label="New Offering"
+            data={`${fromWei(dao.proposalOffering)} ${networkData?.symbol}`}
+            info={INFO_COPY.NEW_OFFERING}
+          />
+        </DataGrid>
+        <DataGrid>
+          <DataIndicator
+            size="sm"
+            label="Quorum %"
+            data={formatValueTo({
+              value: dao.quorumPercent,
+              format: 'percent',
+            })}
+            info={INFO_COPY.QUORUM}
+          />
+          <DataIndicator
+            size="sm"
+            label="Min Retention %"
+            data={formatValueTo({
+              value: dao.minRetentionPercent,
+              format: 'percent',
+            })}
+            info={INFO_COPY.MIN_RETENTION}
+          />
+          <DataIndicator
+            size="sm"
+            label="Sponsor Threshold"
+            data={`${fromWei(dao.sponsorThreshold)} Voting Tokens`}
+            info={INFO_COPY.SPONSOR_THRESHOLD}
+          />
+        </DataGrid>
+      </GovernanceContainer>
+    </SettingsContainer>
   );
 };
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/MetadataSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/MetadataSettings.tsx
index a3828c06..ba679a59 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/MetadataSettings.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/MetadataSettings.tsx
@@ -20,6 +20,7 @@ import {
   DaoProfileAvatar,
   MetaCardHeader,
   MetaContent,
+  SettingsContainer,
   WarningContainer,
 } from './DaoSettings.styles';
 import { useDHConnect } from '@daohaus/connect';
@@ -53,7 +54,7 @@ export const MetadataSettings = ({
   const isMobile = useBreakpoint(widthQuery.sm);
 
   return (
-    <>
+    <SettingsContainer>
       <MetaCardHeader>
         <H3>Metadata</H3>
         {includeLinks && enableActions && (
@@ -61,7 +62,7 @@ export const MetadataSettings = ({
             color="secondary"
             to={`/molochv3/${daoChain}/${dao.id}/settings/update`}
           >
-            Update Settings
+            Update Metadata
           </ButtonRouterLink>
         )}
       </MetaCardHeader>
@@ -111,6 +112,6 @@ export const MetadataSettings = ({
           )}
         </div>
       </MetaContent>
-    </>
+    </SettingsContainer>
   );
 };
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanSettings.tsx
index c4bae7b9..8a221efc 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanSettings.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/ShamanSettings.tsx
@@ -2,7 +2,11 @@ import { H3, ParSm } from '@daohaus/ui';
 
 import { MolochV3Dao } from '@daohaus/moloch-v3-data';
 import { ValidNetwork } from '@daohaus/keychain-utils';
-import { ShamanCardHeader, ShamanContainer } from './DaoSettings.styles';
+import {
+  SettingsContainer,
+  ShamanCardHeader,
+  ShamanContainer,
+} from './DaoSettings.styles';
 import { ShamanList } from './ShamanList';
 
 type ShamanSettingsProps = {
@@ -17,27 +21,29 @@ export const ShamanSettings = ({
   includeLinks = false,
 }: ShamanSettingsProps) => {
   return (
-    <ShamanContainer>
-      <ShamanCardHeader>
-        <H3>Shamans</H3>
-      </ShamanCardHeader>
-      <div className="description">
-        <ParSm>
-          Shamans are contracts that can adjust governance settings, token
-          settings, and memberships without proposals. Because shamans can
-          affect the security of the DAO, be cautious when adding new shamans,
-          and remove any that are no longer needed.
-        </ParSm>
-      </div>
+    <SettingsContainer>
+      <ShamanContainer>
+        <ShamanCardHeader>
+          <H3>Shamans</H3>
+        </ShamanCardHeader>
+        <div className="description">
+          <ParSm>
+            Shamans are contracts that can adjust governance settings, token
+            settings, and memberships without proposals. Because shamans can
+            affect the security of the DAO, be cautious when adding new shamans,
+            and remove any that are no longer needed.
+          </ParSm>
+        </div>
 
-      {dao.shamen && dao.shamen.length > 0 && (
-        <ShamanList
-          shamen={dao.shamen}
-          daoChain={daoChain}
-          daoId={dao.id}
-          includeLinks={includeLinks}
-        />
-      )}
-    </ShamanContainer>
+        {dao.shamen && dao.shamen.length > 0 && (
+          <ShamanList
+            shamen={dao.shamen}
+            daoChain={daoChain}
+            daoId={dao.id}
+            includeLinks={includeLinks}
+          />
+        )}
+      </ShamanContainer>
+    </SettingsContainer>
   );
 };
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/TokenSettings.tsx b/libs/moloch-v3-macro-ui/src/components/DaoSettings/TokenSettings.tsx
new file mode 100644
index 00000000..02ffbeb9
--- /dev/null
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/TokenSettings.tsx
@@ -0,0 +1,115 @@
+import { useMemo } from 'react';
+import { H3, H4, DataIndicator } from '@daohaus/ui';
+import { MolochV3Dao } from '@daohaus/moloch-v3-data';
+import {
+  charLimit,
+  formatValueTo,
+  fromWei,
+  lowerCaseLootToken,
+  toWholeUnits,
+} from '@daohaus/utils';
+
+import { ValidNetwork } from '@daohaus/keychain-utils';
+import {
+  GovernanceContainer,
+  SettingsContainer,
+  TokenDataGrid,
+  TokensHeader,
+} from './DaoSettings.styles';
+import { ButtonRouterLink } from '../Layout';
+
+type TokenSettingsProps = {
+  dao: MolochV3Dao;
+  daoChain: ValidNetwork;
+  includeLinks?: boolean;
+};
+
+export const TokenSettings = ({
+  dao,
+  daoChain,
+  includeLinks = false,
+}: TokenSettingsProps) => {
+  const defaultValues = useMemo(() => {
+    if (!dao) return null;
+    return {
+      votingPeriod: dao.votingPeriod,
+      votingPeriodUnits: 'seconds',
+      gracePeriodUnits: 'seconds',
+      gracePeriod: dao.gracePeriod,
+      quorum: dao.quorumPercent,
+      minRetention: dao.minRetentionPercent,
+      sponsorThreshold: toWholeUnits(dao.sponsorThreshold),
+      newOffering: toWholeUnits(dao.proposalOffering),
+      vStake: dao.sharesPaused,
+      nvStake: dao.lootPaused,
+    };
+  }, [dao]);
+
+  return (
+    <SettingsContainer>
+      <GovernanceContainer>
+        <TokensHeader>
+          <H3 className="tokens">DAO Tokens</H3>
+          {includeLinks && (
+            <ButtonRouterLink
+              color="secondary"
+              to={`/molochv3/${daoChain}/${
+                dao.id
+              }/new-proposal?formLego=TOKEN_SETTINGS&defaultValues=${JSON.stringify(
+                defaultValues
+              )}`}
+            >
+              Update Tokens
+            </ButtonRouterLink>
+          )}
+        </TokensHeader>
+        <H4>Voting</H4>
+        <TokenDataGrid>
+          <DataIndicator
+            size="sm"
+            label="Total"
+            data={formatValueTo({
+              value: fromWei(dao.totalShares),
+              decimals: 2,
+              format: 'number',
+            })}
+          />
+          <DataIndicator size="sm" label="Symbol" data={dao.shareTokenSymbol} />
+          <DataIndicator
+            size="sm"
+            label="Name"
+            data={charLimit(dao.shareTokenName, 12)}
+          />
+          <DataIndicator
+            size="sm"
+            label="Transferability"
+            data={dao.sharesPaused ? 'Off' : 'On'}
+          />
+        </TokenDataGrid>
+        <H4>Non-Voting</H4>
+        <TokenDataGrid>
+          <DataIndicator
+            size="sm"
+            label="Total"
+            data={formatValueTo({
+              value: fromWei(dao.totalLoot),
+              decimals: 2,
+              format: 'number',
+            })}
+          />
+          <DataIndicator size="sm" label="Symbol" data={dao.lootTokenSymbol} />
+          <DataIndicator
+            size="sm"
+            label="Name"
+            data={charLimit(lowerCaseLootToken(dao.lootTokenName), 12)}
+          />
+          <DataIndicator
+            size="sm"
+            label="Transferability"
+            data={dao.lootPaused ? 'Off' : 'On'}
+          />
+        </TokenDataGrid>
+      </GovernanceContainer>
+    </SettingsContainer>
+  );
+};
diff --git a/libs/moloch-v3-macro-ui/src/components/DaoSettings/index.ts b/libs/moloch-v3-macro-ui/src/components/DaoSettings/index.ts
index e5ed9d1a..4b1c5053 100644
--- a/libs/moloch-v3-macro-ui/src/components/DaoSettings/index.ts
+++ b/libs/moloch-v3-macro-ui/src/components/DaoSettings/index.ts
@@ -4,3 +4,4 @@ export * from './GovernanceSettings';
 export * from './MetadataSettings';
 export * from './ShamanSettings';
 export * from './ShamanList';
+export * from './TokenSettings';
diff --git a/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.styles.ts b/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.styles.ts
index feb14a76..f11f1749 100644
--- a/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.styles.ts
+++ b/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.styles.ts
@@ -1,6 +1,10 @@
-import { Card, ParXs, Theme } from '@daohaus/ui';
-import { RiErrorWarningLine } from 'react-icons/ri';
 import styled from 'styled-components';
+import { Card, ParXs, Theme } from '@daohaus/ui';
+import {
+  RiErrorWarningLine,
+  RiArrowUpSLine,
+  RiArrowDownSLine,
+} from 'react-icons/ri/index.js';
 
 export const MainContainer = styled.div`
   padding: 0rem 2.6rem;
@@ -11,6 +15,12 @@ export const LoadingContainer = styled.div`
   justify-content: center;
 `;
 
+export const TitleContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
+
 export const DisplayContainer = styled.div`
   margin-top: 2rem;
 
@@ -86,3 +96,15 @@ export const IconContainer = styled.div`
 `;
 
 export const MessageContainer = styled.div``;
+
+export const StyledUpArrow = styled(RiArrowUpSLine)`
+  font-size: 3rem;
+  font-weight: 900;
+  color: ${({ theme }: { theme: Theme }) => theme.primary.step10};
+`;
+
+export const StyledDownArrow = styled(RiArrowDownSLine)`
+  font-size: 3rem;
+  font-weight: 900;
+  color: ${({ theme }: { theme: Theme }) => theme.primary.step10};
+`;
diff --git a/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx b/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx
index 6a0085ce..004d73b9 100644
--- a/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx
+++ b/libs/moloch-v3-macro-ui/src/components/ProposalActionData/ProposalActionData.tsx
@@ -12,6 +12,7 @@ import {
   DataSm,
   Divider,
   H4,
+  ParMd,
   Spinner,
   useBreakpoint,
   widthQuery,
@@ -23,7 +24,6 @@ import {
   PROPOSAL_TYPE_WARNINGS,
   SENSITIVE_PROPOSAL_TYPES,
   TXLego,
-  ValidArgType,
 } from '@daohaus/utils';
 
 import { ActionAlert } from './ActionAlert';
@@ -31,6 +31,9 @@ import {
   DisplayContainer,
   LoadingContainer,
   MainContainer,
+  StyledDownArrow,
+  StyledUpArrow,
+  TitleContainer,
 } from './ProposalActionData.styles';
 import { ProposalWarning } from './ProposalWarning';
 import { ValueDisplay } from './ValueDisplay';
@@ -61,6 +64,7 @@ export const ProposalActionData = ({
   txLegos = {},
 }: ProposalActionDataProps) => {
   const [decodeError, setDecodeError] = useState<boolean>(false);
+  const [open, setOpen] = useState<boolean>(false);
   const [actionData, setActionData] = useState<DecodedMultiTX | null>();
   const [actionsMeta, setActionsMeta] = useState<MulticallAction[]>();
 
@@ -105,90 +109,109 @@ export const ProposalActionData = ({
     };
   }, [daoChain, proposal, actionsMeta]);
 
+  const handleToggle = () => {
+    setOpen((prevState) => !prevState);
+  };
+
   return (
     <MainContainer>
       <DisplayContainer>
-        {!actionData && (
-          <LoadingContainer>
-            <Spinner size="6rem" />
-          </LoadingContainer>
-        )}
-        {actionData?.map((action, index) => {
-          if (isActionError(action)) {
+        <TitleContainer>
+          <ParMd>Transaction Call Data</ParMd>
+          {!actionData && (
+            <LoadingContainer>
+              <Spinner size="6rem" />
+            </LoadingContainer>
+          )}
+
+          {open && (
+            <div onClick={handleToggle}>
+              <StyledUpArrow />
+            </div>
+          )}
+          {!open && (
+            <div onClick={handleToggle}>
+              <StyledDownArrow />
+            </div>
+          )}
+        </TitleContainer>
+        {open &&
+          actionData?.map((action, index) => {
+            if (isActionError(action)) {
+              return (
+                <div
+                  className="display-segment data"
+                  key={`${action.message}-${index}`}
+                >
+                  <H4 className="space">Action {index + 1}: Error</H4>
+                  <DataSm className="space">{action.message}</DataSm>
+                  <Divider className="space" />
+                  <DataSm className="space">
+                    <Bold>HEX DATA:</Bold>
+                  </DataSm>
+                  <DataSm className="space">{action.data}</DataSm>
+                </div>
+              );
+            }
             return (
-              <div
-                className="display-segment data"
-                key={`${action.message}-${index}`}
-              >
-                <H4 className="space">Action {index + 1}: Error</H4>
-                <DataSm className="space">{action.message}</DataSm>
-                <Divider className="space" />
-                <DataSm className="space">
-                  <Bold>HEX DATA:</Bold>
-                </DataSm>
-                <DataSm className="space">{action.data}</DataSm>
+              <div className="display-segment" key={`action_${index}`}>
+                <div className="data">
+                  <H4 className="space">
+                    Action {index + 1}: {action.name}
+                  </H4>
+                  <ActionAlert
+                    action={action}
+                    daoId={daoId}
+                    daoChain={daoChain}
+                    proposalType={proposal.proposalType}
+                    proposalActionConfig={proposalActionConfig}
+                  />
+                  <DataSm className="space">
+                    <Bold>TARGET</Bold>
+                  </DataSm>
+                  <AddressDisplay
+                    className="space"
+                    address={action.to}
+                    copy
+                    explorerNetworkId={network}
+                    truncate={isMobile}
+                  />
+                  <DataSm className="space">
+                    <Bold>VALUE</Bold>
+                  </DataSm>
+                  <DataSm className="space">{action.value}</DataSm>
+                  <Divider className="spaced-divider" />
+                </div>
+                {action.params?.map((arg, index) => {
+                  return (
+                    <div className="data" key={`${arg.name}-${index}`}>
+                      <DataSm className="space">
+                        <Bold>
+                          PARAM
+                          {index + 1}:{' '}
+                        </Bold>
+                        {arg.name}
+                      </DataSm>
+                      <DataSm className="space">
+                        <Bold>TYPE: </Bold>
+                        {arg.type}
+                      </DataSm>
+                      <DataSm className="space">
+                        <Bold>VALUE: </Bold>
+                      </DataSm>
+                      <ValueDisplay
+                        argValue={arg.value}
+                        argType={arg.type}
+                        network={network}
+                        isMobile={isMobile}
+                      />
+                      <Divider />
+                    </div>
+                  );
+                })}
               </div>
             );
-          }
-          return (
-            <div className="display-segment" key={`action_${index}`}>
-              <div className="data">
-                <H4 className="space">
-                  Action {index + 1}: {action.name}
-                </H4>
-                <ActionAlert
-                  action={action}
-                  daoId={daoId}
-                  daoChain={daoChain}
-                  proposalType={proposal.proposalType}
-                  proposalActionConfig={proposalActionConfig}
-                />
-                <DataSm className="space">
-                  <Bold>TARGET</Bold>
-                </DataSm>
-                <AddressDisplay
-                  className="space"
-                  address={action.to}
-                  copy
-                  explorerNetworkId={network}
-                  truncate={isMobile}
-                />
-                <DataSm className="space">
-                  <Bold>VALUE</Bold>
-                </DataSm>
-                <DataSm className="space">{action.value}</DataSm>
-                <Divider className="spaced-divider" />
-              </div>
-              {action.params?.map((arg, index) => {
-                return (
-                  <div className="data" key={`${arg.name}-${index}`}>
-                    <DataSm className="space">
-                      <Bold>
-                        PARAM
-                        {index + 1}:{' '}
-                      </Bold>
-                      {arg.name}
-                    </DataSm>
-                    <DataSm className="space">
-                      <Bold>TYPE: </Bold>
-                      {arg.type}
-                    </DataSm>
-                    <DataSm className="space">
-                      <Bold>VALUE: </Bold>
-                    </DataSm>
-                    <ValueDisplay
-                      argValue={arg.value}
-                      argType={arg.type}
-                      network={network}
-                      isMobile={isMobile}
-                    />
-                    <Divider />
-                  </div>
-                );
-              })}
-            </div>
-          );
-        })}
+          })}
       </DisplayContainer>
       {decodeError && (
         <ProposalWarning