diff --git a/_includes/footer.html b/_includes/footer.html
index 560eae661..e854e5eb3 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,31 +1,32 @@
-  <footer class="usa-footer usa-background-dark">
+  <footer class="usa-identifier usa-footer usa-background-dark">
     <div class="usa-grid">
       <nav aria-label="footer navigation">
+        <div class="usa-width-one-whole" style="margin-bottom: 1em; color: white;">
+          <div>open.gsa.gov / GSA Office of Office of Enterprise Data & Privacy Management</div>
+          <div style="font-weight: bold;">An official website of the U.S. General Services Administration</div>
+        </div>
         <div class="usa-width-one-fourth">
-          <h3>Work</h3>
           <ul class="usa-unstyled-list">
-            <li><a href="{{ '/about' | prepend: site.baseurl }}">About us</a></li>
-            <li><a href="https://github.com/GSA/">Our projects</a></li>
+            <li><a href="https://www.gsa.gov/about-us">About us</a></li>
+            <li><a href="https://www.gsa.gov/website-information/accessibility-aids">Accessibility support</a></li>
           </ul>
         </div>
         <div class="usa-width-one-fourth">
-          <h3>Open Source</h3>
           <ul class="usa-unstyled-list">
-            <li><a href="https://github.com/gsa/open-gsa-redesign">Fork this site</a></li>
+            <li><a href="https://www.gsa.gov/reference/freedom-of-information-act-foia">FOIA requests</a></li>
+            <li><a href="https://www.gsa.gov/reference/civil-rights-programs/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002">No FEAR Act data</a></li>
           </ul>
         </div>
         <div class="usa-width-one-fourth">
-          <h3>Contact Us</h3>
           <ul class="usa-unstyled-list">
-            <li><a href="{{ '/contact' | prepend: site.baseurl }}">Contact us</a></li>
+            <li><a href="https://www.gsaig.gov/">Office of the Inspector General</a></li>
+            <li><a href="https://www.gsa.gov/reference/reports/budget-performance">Performance reports</a></li>
           </ul>
         </div>
         <div class="usa-width-one-fourth">
-          <h3>Notices</h3>
           <ul class="usa-unstyled-list">
-            <li><a href="https://www.gsa.gov/website-information/accessibility-aids">Accessibility support</a></li>
-            <li><a href="https://www.gsa.gov/reference/freedom-of-information-act-foia">FOIA requests</a></li>
             <li><a href="https://www.gsa.gov/website-information/website-policies">Privacy policy</a></li>
+            <li><a href="{{ '/contact' | prepend: site.baseurl }}">Contact us</a></li>
           </ul>
         </div>
       </nav>
diff --git a/_includes/footerapi.html b/_includes/footerapi.html
deleted file mode 100755
index c3ba8d8d4..000000000
--- a/_includes/footerapi.html
+++ /dev/null
@@ -1,33 +0,0 @@
-  <footer class="usa-footer usa-background-dark">
-    <div class="usa-grid">
-      <nav aria-label="footer navigation">
-        <div class="usa-width-one-fourth">
-          <h3>Work</h3>
-          <ul class="usa-unstyled-list">
-            <li><a href="{{ '/about' | prepend: site.baseurl }}">About us</a></li>
-            <li><a href="https://github.com/GSA/">Our projects</a></li>
-          </ul>
-        </div>
-        <div class="usa-width-one-fourth">
-          <h3>Open Source</h3>
-          <ul class="usa-unstyled-list">
-            <li><a href="https://github.com/gsa/open-gsa-redesign">Edit this site</a></li>
-<!--            <li><a href="https://github.com/gsa/open-gsa-redesign/issues">Submit feedback</a></li> -->
-          </ul>
-        </div>
-        <div class="usa-width-one-fourth">
-          <!-- <h3>Contact Us</h3>
-          <ul class="usa-unstyled-list">
-            <li><a href="mailto:open@gsa.gov">Email us</a></li> -->
-        </div>
-        <div class="usa-footer-logo usa-width-one-fourth">
-          {% if site.footer.text %}
-            <p><small>{{ site.footer.text }}</small></p>
-          {% endif %}
-          {% if site.footer.image %}
-            <p><img src="{{ site.footer.image | prepend: site.baseurl }}" alt="{{ site.footer.image-alt }}" class="logo"></p>
-          {% endif %}
-        </div>
-      </nav>
-    </div>
-  </footer>
diff --git a/_layouts/apidocs.html b/_layouts/apidocs.html
index 3c1427a65..edbeb2443 100644
--- a/_layouts/apidocs.html
+++ b/_layouts/apidocs.html
@@ -1,5 +1,5 @@
 ---
-layout: pageapi
+layout: page
 ---
 
 <aside class="usa-width-one-fourth sidebar-sticky" style="word-wrap: break-word;">
diff --git a/_layouts/baseapi.html b/_layouts/baseapi.html
deleted file mode 100755
index b3d38522b..000000000
--- a/_layouts/baseapi.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html lang="en">
-
-{% include head.html %}
-
-<body>
-    <div id="wrapper">
-        <div id="header">{% include header.html %}</div>
-        <div id="content">{{ content }}</div>
-        <div id="footer">{% include footerapi.html %}</div>
-
-    </div>
-      {% include javascript.html %}
-</body>
-
-</html>
diff --git a/_layouts/pageapi.html b/_layouts/pageapi.html
deleted file mode 100755
index fe558e0a1..000000000
--- a/_layouts/pageapi.html
+++ /dev/null
@@ -1,13 +0,0 @@
----
-layout: baseapi
----
-{% if page.banner-heading %}
-  {% include banner-header.html %}
-{% endif %}
-
-<main class="usa-grid" id="main" tabindex="-1">
-  <section>
-    {{ content }}
-  </section>
-  <div class="fixed-page-height"></div>
-</main>
diff --git a/pages/contact.md b/pages/contact.md
index bcc473cf0..446e7cb19 100644
--- a/pages/contact.md
+++ b/pages/contact.md
@@ -7,7 +7,7 @@ banner-heading: Contact Us
 
 ### How to get help with an API
 
-Each API has its own specific support team. If you need assistance with an API, please visit the [API Documentation]({{ '/api' | prepend: site.baseurl }}) for the API you are interested in, and use the contact information listed under the *Contact Us* section. You may also contact [the GSA Office of the CTO](mailto:open@gsa.gov) for assistance in identifying the best point of contact for an API.
+Each API has its own specific support team. If you need assistance with an API, please visit the [API Documentation]({{ '/api' | prepend: site.baseurl }}) for the API you are interested in, and use the contact information listed under the *Contact Us* section. You may also contact [the GSA Office of Office of Enterprise Data & Privacy Management](mailto:open@gsa.gov) for assistance in identifying the best point of contact for an API.
 
 ### How to submit feedback regarding this website
 
@@ -15,4 +15,4 @@ The openGSA website is open source, and we welcome your feedback on it. [Please
 
 ### General inquiries
 
-For all other inquiries related to open data and open source at GSA, please [email the GSA Office of the CTO](mailto:open@gsa.gov). Please note that this email address cannot answer API-related questions.
+For all other inquiries related to open data and open source at GSA, please [email the GSA Office of Office of Enterprise Data & Privacy Management](mailto:open@gsa.gov). Please note that this email address cannot answer API-related questions.