diff --git a/app/src/Controller/AppController.php b/app/src/Controller/AppController.php
index 7a6dc4d4e..0ea3cec5d 100644
--- a/app/src/Controller/AppController.php
+++ b/app/src/Controller/AppController.php
@@ -44,6 +44,8 @@
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
 
 /**
  * @property \App\Controller\Component\RegistryAuthComponent $RegistryAuth
@@ -692,8 +694,26 @@ protected function getTheme() {
     // because we don't necessarily know what information a model-specific Theme
     // is based on.
 
-    if(method_exists($this, "getSpecificTheme")) {
-      $theme = $this->getSpecificTheme();
+    if(method_exists($this, 'getSpecificTheme')) {
+      $specificTheme = $this->getSpecificTheme();
+
+      // Even if the method exists, be sure it doesn't return null.
+      if(isset($specificTheme)) {
+        $theme = $specificTheme;
+      }
+    }
+
+    if(isset($theme)) {
+      $htmlSanitizer = new HtmlSanitizer(
+        // Allow all elements from the W3C Sanitizer API. This is more permissive than "allowSafeElements()".
+        // See: https://github.com/symfony/symfony/blob/7.2/src/Symfony/Component/HtmlSanitizer/Reference/W3CReference.php
+        (new HtmlSanitizerConfig())->allowStaticElements()
+      );
+
+      $theme->set([
+        'sanitized_header' => $htmlSanitizer->sanitize($theme->header),
+        'sanitized_footer' => $htmlSanitizer->sanitize($theme->footer)
+      ]);
     }
 
     $this->set('vv_theme', $theme);
diff --git a/app/src/Lib/Traits/ValidationTrait.php b/app/src/Lib/Traits/ValidationTrait.php
index 9bc7836f4..bf046dc13 100644
--- a/app/src/Lib/Traits/ValidationTrait.php
+++ b/app/src/Lib/Traits/ValidationTrait.php
@@ -63,6 +63,33 @@ public function registerClonableValidation(
     return $validator;
   }
 
+  /**
+   * Register validation rules for the provided field, as HTML.
+   *
+   * @since  COmanage Registry v5.0.0
+   * @param  Validator            $validator Cake Validator
+   * @param  TableSchemaInterface $schema    Cake Schema
+   * @param  string               $field     Field name
+   * @return Validator             Cake Validator
+   */
+
+  public function registerHtmlValidation(
+    Validator             $validator,
+    TableSchemaInterface  $schema,
+    string                $field
+  ): Validator {
+    $validator->add($field, [
+      'filter' => ['rule'     => ['validateInput', ['type' => 'html']],
+                   'provider' => 'table'],
+      'size'   => ['rule'     => ['validateMaxLength', ['column' => $schema->getColumn($field)]],
+                   'provider' => 'table']
+    ]);
+
+    $validator->allowEmptyString($field);
+
+    return $validator;
+  }
+
   /**
    * Register validation rules for the primary link key(s) associated with this table.
    * 
diff --git a/app/src/Model/Table/MessageTemplatesTable.php b/app/src/Model/Table/MessageTemplatesTable.php
index 384929fa7..1ee75c2bf 100644
--- a/app/src/Model/Table/MessageTemplatesTable.php
+++ b/app/src/Model/Table/MessageTemplatesTable.php
@@ -150,11 +150,7 @@ public function validationDefault(Validator $validator): Validator {
     ]);
     $validator->allowEmptyString('body_text');
 
-    $validator->add('body_html', [
-      'filter'  => ['rule'     => ['validateInput',['type' => 'html']],
-                    'provider' => 'table']
-    ]);
-    $validator->allowEmptyString('body_html');
+    $this->registerHtmlValidation($validator, $schema, 'body_html');
 
     $this->registerStringValidation($validator, $schema, 'cc', false);
 
diff --git a/app/src/Model/Table/MostlyStaticPagesTable.php b/app/src/Model/Table/MostlyStaticPagesTable.php
index 76d1d9a0a..3f80f8545 100644
--- a/app/src/Model/Table/MostlyStaticPagesTable.php
+++ b/app/src/Model/Table/MostlyStaticPagesTable.php
@@ -273,11 +273,7 @@ public function validationDefault(Validator $validator): Validator {
     ]);
     $validator->notEmptyString('context');
 
-    $validator->add('body', [
-      'filter'  => ['rule'     => ['validateInput', ['type' => 'html']],
-                    'provider' => 'table']
-    ]);
-    $validator->allowEmptyString('body');
+    $this->registerHtmlValidation($validator, $schema, 'body');
 
     $validator->add('theme_id', [
       'content' => ['rule' => 'isInteger']
diff --git a/app/src/Model/Table/ThemesTable.php b/app/src/Model/Table/ThemesTable.php
index bb1b5badd..643a1fbf8 100644
--- a/app/src/Model/Table/ThemesTable.php
+++ b/app/src/Model/Table/ThemesTable.php
@@ -68,6 +68,8 @@ public function initialize(array $config): void {
     
     $this->setPrimaryLink('co_id');
     $this->setRequiresCO(true);
+    // Return to the form on save to make theme development easier.
+    $this->setRedirectGoal('self');
     
     $this->setPermissions([
       // Actions that operate over an entity (ie: require an $id)
@@ -114,9 +116,9 @@ public function validationDefault(Validator $validator): Validator {
 
     $this->registerStringValidation($validator, $schema, 'css', false);
 
-    $this->registerStringValidation($validator, $schema, 'header', false);
+    $this->registerHtmlValidation($validator, $schema, 'header');
 
-    $this->registerStringValidation($validator, $schema, 'footer', false);
+    $this->registerHtmlValidation($validator, $schema, 'footer');
 
     return $validator; 
   }
diff --git a/app/templates/MessageTemplates/fields.inc b/app/templates/MessageTemplates/fields.inc
index be05fef67..b429640a5 100644
--- a/app/templates/MessageTemplates/fields.inc
+++ b/app/templates/MessageTemplates/fields.inc
@@ -36,7 +36,7 @@ $fields = [
   ],
   'body_html' => [
     'afterField' => 
-      '<div class="alert alert-info small p-2 d-flex gap-1" role="alert">' .
+      '<div class="alert alert-info small p-2 d-flex gap-1 big-text-area-message" role="alert">' .
       '  <em class="material-symbols-outlined" aria-hidden="true">info</em>' .  
       '  <span class="alert-text">' . __d('information','html.sanitization') . '</span>' .
       '</div>',
diff --git a/app/templates/MostlyStaticPages/fields.inc b/app/templates/MostlyStaticPages/fields.inc
index d105a7452..90893fa4c 100644
--- a/app/templates/MostlyStaticPages/fields.inc
+++ b/app/templates/MostlyStaticPages/fields.inc
@@ -37,7 +37,7 @@ $fields = [
   'body' => [
     'class' => 'big-textarea',
     'afterField' => 
-      '<div class="alert alert-info small p-2 d-flex gap-1" role="alert">' .
+      '<div class="alert alert-info small p-2 d-flex gap-1 big-text-area-message" role="alert">' .
       '  <em class="material-symbols-outlined" aria-hidden="true">info</em>' .
       '  <span class="alert-text">' . __d('information','html.sanitization') . '</span>' .
       '</div>'
diff --git a/app/templates/Themes/fields.inc b/app/templates/Themes/fields.inc
index 574dc6990..6978bbcec 100644
--- a/app/templates/Themes/fields.inc
+++ b/app/templates/Themes/fields.inc
@@ -33,9 +33,19 @@ $fields = [
     'class' => 'big-textarea'
   ],
   'header' => [
-    'class' => 'big-textarea'
+    'class' => 'big-textarea',
+    'afterField' =>
+      '<div class="alert alert-info small p-2 d-flex gap-1 big-text-area-message" role="alert">' .
+      '  <em class="material-symbols-outlined" aria-hidden="true">info</em>' .
+      '  <span class="alert-text">' . __d('information','html.sanitization') . '</span>' .
+      '</div>'
   ],
   'footer' => [
-    'class' => 'big-textarea'
+    'class' => 'big-textarea',
+    'afterField' =>
+      '<div class="alert alert-info small p-2 d-flex gap-1 big-text-area-message" role="alert">' .
+      '  <em class="material-symbols-outlined" aria-hidden="true">info</em>' .
+      '  <span class="alert-text">' . __d('information','html.sanitization') . '</span>' .
+      '</div>'
   ]
 ];
diff --git a/app/templates/element/footer.php b/app/templates/element/comanageLogo.php
similarity index 94%
rename from app/templates/element/footer.php
rename to app/templates/element/comanageLogo.php
index df971e147..30d5dc0fd 100644
--- a/app/templates/element/footer.php
+++ b/app/templates/element/comanageLogo.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * COmanage Registry Footer
+ * COmanage Registry Logo (for bottom of content area)
  *
  * Portions licensed to the University Corporation for Advanced Internet
  * Development, Inc. ("UCAID") under one or more contributor license agreements.
@@ -26,7 +26,7 @@
  */
 ?>
 
-<div class="footer">
+<div id="comanage-logo">
   <div class="poweredByComanage">
     <span class="poweredText"><?= __('registry.meta.powered'); ?></span>
     <?= $this->Html->image('COmanage-Logo-LG-onWhite.png', array('alt' => 'COmanage', 'height' => 30)); ?>
diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php
index d3376b854..f37219223 100644
--- a/app/templates/element/javascript.php
+++ b/app/templates/element/javascript.php
@@ -53,7 +53,7 @@
           false
         );
       }
-      $('#navigation-drawer').toggleClass('closed');
+      $('#navigation-drawer').toggleClass('closed open');
     });
 
     $('#co-hamburger').click(function() {
diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php
index 68bce6f46..d86296377 100644
--- a/app/templates/element/menuPanel.php
+++ b/app/templates/element/menuPanel.php
@@ -605,6 +605,8 @@
                 <em class="material-symbols-outlined" aria-hidden="true">email</em>
                 <span class="menu-panel-link-text"><?= __d('controller', 'MessageTemplates', [99]) ?></span>
               </a>
+            </li>
+            <li>
               <?php
                 $menuUrl = $this->Url->build(
                   ['plugin'       => null,
@@ -620,9 +622,24 @@
                 <span class="menu-panel-link-text"><?= __d('controller', 'MostlyStaticPages', [99]) ?></span>
               </a>
             </li>
+            <li>
+              <?php
+                $menuUrl = $this->Url->build(
+                  ['plugin'       => null,
+                   'controller'   => 'themes',
+                   'action'       => 'index',
+                   '?'            => [
+                     'co_id' => $vv_cur_co->id
+                   ]]
+                );
+              ?>
+              <a href="<?= $menuUrl ?>">
+                <em class="material-symbols" aria-hidden="true">colors</em>
+                <span class="menu-panel-link-text"><?= __d('controller', 'Themes', [99]) ?></span>
+              </a>
+            </li>
             <?php /* More placeholders:
             <li><a href="#"><em class="material-symbols" aria-hidden="true">room_service</em> Self Service Permissions</a></li>
-            <li><a href="#"><em class="material-symbols" aria-hidden="true">wallpaper</em> Themes</a></li>
             * / ? >
           </ul>
         </li>
diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php
index 2cc194404..519bb3df7 100644
--- a/app/templates/layout/default.php
+++ b/app/templates/layout/default.php
@@ -98,6 +98,12 @@
     <?= $this->fetch('meta') ?>
     <?= $this->fetch('css') ?>
     <?= $this->fetch('script') ?>
+
+    <?php if(!empty($vv_theme?->css)): // we have theme CSS ?>
+      <style>
+        <?= h($vv_theme->css) ?>
+      </style>
+    <?php endif; ?>
   </head>
 
   <?php
@@ -131,115 +137,127 @@
 
     <!-- Primary layout -->
     <div id="comanage-wrapper">
-      <!-- Include custom header -->
-      <?php if(!empty($vv_theme_header)): ?>
-        <header id="customHeader">
-          <div class="contentWidth">
-            <?php print $vv_theme_header ?>
-          </div>
-        </header>
-      <?php endif; ?>
+      <div id="comanage-content-wrapper">
+        
+        <?php if(!empty($vv_theme?->sanitized_header)): 
+          // Include sanitized custom header ?>
+          <header id="custom-header">
+            <?= $vv_theme->sanitized_header ?>
+          </header>
+        <?php endif; ?>
 
-      <header id="banner">
-        <div id="logo-title-wrapper">
-          <?php if($generateHomeLink): ?> 
-            <?php
-              // wrap the logo and the title in the home link
-              $cmHomeLink = $this->Url->build([
-                'plugin'       => null,
-                'controller'   => 'Dashboards',
-                'action'       => 'dashboard',
-                '?' => ['co_id' => $vv_cur_co->id]],
-                ['escape' => false]
-              );
-            ?>
-            <a href="<?= $cmHomeLink ?>">
-          <?php endif; ?>
-          <div id="logo">
-            <?=
-              $this->Html->image(
-                "COmanage-Gears.svg",
-                array(
-                  'alt' => __('registry.meta.logo')
-                )
-              );
-            ?>
-          </div>
-          <div id="siteTitle">
-            <?php if($generateHomeLink): ?>
-              <?= h($vv_cur_co['name']) ?>
-            <?php else: ?>
-              <?= __('registry.meta.registry') ?>
-            <?php endif; ?>          
+        <?php if(!$vv_theme?->hide_title):
+          // Display title bar unless hidden by theme setting ?>
+          <header id="banner">
+            <div id="logo-title-wrapper">
+              <?php if($generateHomeLink): ?> 
+                <?php
+                  // wrap the logo and the title in the home link
+                  $cmHomeLink = $this->Url->build([
+                    'plugin'       => null,
+                    'controller'   => 'Dashboards',
+                    'action'       => 'dashboard',
+                    '?' => ['co_id' => $vv_cur_co->id]],
+                    ['escape' => false]
+                  );
+                ?>
+                <a href="<?= $cmHomeLink ?>">
+              <?php endif; ?>
+              <div id="logo">
+                <?=
+                  $this->Html->image(
+                    "COmanage-Gears.svg",
+                    array(
+                      'alt' => __('registry.meta.logo')
+                    )
+                  );
+                ?>
+              </div>
+              <div id="siteTitle">
+                <?php if($generateHomeLink): ?>
+                  <?= h($vv_cur_co['name']) ?>
+                <?php else: ?>
+                  <?= __('registry.meta.registry') ?>
+                <?php endif; ?>          
+              </div>
+              <?php if($generateHomeLink): ?>
+                </a>
+              <?php endif; ?>
+            </div>
+            <!-- Custom Navigation Links -->
+            <?php if(!empty($vv_NavLinks) || !empty($vv_CoNavLinks)): ?>
+              <div id="user-defined-links-top">
+                <?php print $this->element('links') // XXX allow user to set this location (e.g. top or side) ?>
+              </div>
+            <?php endif ?>
+          </header>
+        <?php endif; ?>
+        
+        <?php if(!$isActivePetition): ?>
+          <div id="top-bar" role="region" aria-label="<?= __d('menu','aria.label.search') ?>">
+            <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
+              <div id="top-controls">
+                <div id="co-hamburger"><em class="material-symbols">menu</em></div>
+                <?= $this->element('searchGlobal') ?>
+              </div>
+            <?php endif; // vv_user ?>
+            <div id="top-menu">
+              <?= $this->element('menuTop') ?>
+            </div>
           </div>
-          <?php if($generateHomeLink): ?>
-            </a>
-          <?php endif; ?>
-        </div>
-        <!-- Custom Navigation Links -->
-        <?php if(!empty($vv_NavLinks) || !empty($vv_CoNavLinks)): ?>
-          <div id="user-defined-links-top">
-            <?php print $this->element('links') // XXX allow user to set this location (e.g. top or side) ?>
+        <?php endif; ?>
+        
+        <?php if($isPlatformCO): ?>
+          <?php
+          $platformConfigUrl = $this->Url->build([
+            'plugin'       => null,
+            'controller'   => 'dashboards',
+            'action'       => 'configuration',
+            '?'            => [
+              'co_id' => 1
+            ]]);
+          ?>
+          <div id="platform-notice">
+            <?= __d('information','cmp.co.notice', [$platformConfigUrl]) ?>
           </div>
-        <?php endif ?>
-      </header>
-      
-      <?php if(!$isActivePetition): ?>
-        <div id="top-bar" role="region" aria-label="<?= __d('menu','aria.label.search') ?>">
-          <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView): ?>
-            <div id="top-controls">
-              <div id="co-hamburger"><em class="material-symbols">menu</em></div>
-              <?= $this->element('searchGlobal') ?>
+        <?php endif; ?>
+  
+        <div id="main-wrapper">
+          <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView && !$isActivePetition): ?>
+            <?= $this->element('menuMain') ?>
+          <?php endif ?>
+  
+          <main id="main" aria-label="main content">
+            <div id="content">
+              <div id="content-inner">
+                <?php if(!$isActivePetition): ?>
+                  <div id="breadcrumbs">
+                    <?= $this->element('breadcrumbs') ?>
+                  </div>
+                <?php endif; ?>
+  
+                <!-- insert the anchor that is the target of accessible "skip to content" link -->
+                <a id="content-start"></a>
+  
+                <!-- insert the page internal content -->
+                <?= $this->fetch('content') ?>
+              </div>
             </div>
-          <?php endif; // vv_user ?>
-          <div id="top-menu">
-            <?= $this->element('menuTop') ?>
-          </div>
+            <?php if(!$vv_theme?->hide_footer_logo):
+              // Display footer logo unless hidden by theme setting ?>
+              <?= $this->element('comanageLogo') ?>
+            <?php endif; ?>
+          </main>
         </div>
-      <?php endif; ?>
-      
-      <?php if($isPlatformCO): ?>
-        <?php
-        $platformConfigUrl = $this->Url->build([
-          'plugin'       => null,
-          'controller'   => 'dashboards',
-          'action'       => 'configuration',
-          '?'            => [
-            'co_id' => 1
-          ]]);
-        ?>
-        <div id="platform-notice">
-          <?= __d('information','cmp.co.notice', [$platformConfigUrl]) ?>
-        </div>
-      <?php endif; ?>
-
-      <div id="main-wrapper">
-        <?php if(!empty($vv_user) && !empty($vv_cur_co) && !$isCoSelectView && !$isActivePetition): ?>
-          <?= $this->element('menuMain') ?>
-        <?php endif ?>
-
-        <main id="main" aria-label="main content">
-          <div id="content">
-            <div id="content-inner">
-              <?php if(!$isActivePetition): ?>
-                <div id="breadcrumbs">
-                  <?= $this->element('breadcrumbs') ?>
-                </div>
-              <?php endif; ?>
+        
+      </div>  
 
-              <!-- insert the anchor that is the target of accessible "skip to content" link -->
-              <a id="content-start"></a>
-
-              <!-- insert the page internal content -->
-              <?= $this->fetch('content') ?>
-            </div>
-          </div>
-        </main>
-      </div>
-
-      <footer id="co-footer">
-        <?= $this->element('footer') ?>
-      </footer>
+      <?php if(!empty($vv_theme?->sanitized_footer)):
+        // include sanitized custom footer ?>
+        <footer id="custom-footer">
+          <?= $vv_theme->sanitized_footer ?>
+        </footer>
+      <?php endif; ?>
     </div>
 
     <!-- loading animation -->
diff --git a/app/templates/layout/error.php b/app/templates/layout/error.php
index 70c363349..26c64d9dd 100644
--- a/app/templates/layout/error.php
+++ b/app/templates/layout/error.php
@@ -59,35 +59,61 @@
   </head>
   <body>
     <div id="comanage-wrapper">
-      <header id="banner">
-        <div id="logo-title-wrapper">
-          <div id="logo">
-            <?=
-              $this->Html->image(
-                "COmanage-Gears.svg",
-                array(
-                  'alt' => __('registry.meta.logo')
-                )
-              );
-            ?>
-          </div>
-          <div id="siteTitle">
-            <?= __('registry.meta.registry') ?>
-          </div>
-        </div>
-      </header>
-      <div id="main-wrapper">
-        <main id="main">
-          <div id="content">
-            <div id="content-inner">
-              <div class="error-container">
-                <?= $this->Flash->render() ?>
-                <?= $this->fetch('content') ?>
+      <div id="comanage-content-wrapper">
+
+        <?php if(!empty($vv_theme?->sanitized_header)):
+          // Include sanitized custom header ?>
+          <header id="custom-header">
+            <?= $vv_theme->sanitized_header ?>
+          </header>
+        <?php endif; ?>
+        
+        <?php if(!$vv_theme?->hide_title):
+          // Display title bar unless hidden by theme setting ?>
+          <header id="banner">
+            <div id="logo-title-wrapper">
+              <div id="logo">
+                <?=
+                  $this->Html->image(
+                    "COmanage-Gears.svg",
+                    array(
+                      'alt' => __('registry.meta.logo')
+                    )
+                  );
+                ?>
+              </div>
+              <div id="siteTitle">
+                <?= __('registry.meta.registry') ?>
               </div>
             </div>
-          </div>
-        </main>
-      </div>  
-    </div>  
+          </header>
+        <?php endif; ?>
+        
+        <div id="main-wrapper">
+          <main id="main">
+            <div id="content">
+              <div id="content-inner">
+                <div class="error-container">
+                  <?= $this->Flash->render() ?>
+                  <?= $this->fetch('content') ?>
+                </div>
+              </div>
+            </div>
+            <?php if(!$vv_theme?->hide_footer_logo):
+              // Display footer logo unless hidden by theme setting ?>
+              <?= $this->element('comanageLogo') ?>
+            <?php endif; ?>
+          </main>
+        </div>
+        
+      </div>
+
+      <?php if(!empty($vv_theme?->sanitized_footer)):
+        // include sanitized custom footer ?>
+        <footer id="custom-footer">
+          <?= $vv_theme->sanitized_footer ?>
+        </footer>
+      <?php endif; ?>
+    </div>
   </body>
 </html>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 50ad41695..50064530a 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -37,6 +37,17 @@ body {
   -webkit-overflow-scrolling: touch; /* for dialog boxes */
   font-size: 14px; /* base font size */
 }
+#comanage-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  min-height: 100vh;
+}
+#comanage-content-wrapper {
+  display: flex;
+  flex-direction: column;
+  flex: 1 0 auto;
+}
 h1,h2,h3,h4,h5 {
   color: var(--cmg-color-headings);
 }
@@ -483,6 +494,15 @@ ul.form-list li.alert-banner .co-alert {
 /* MAIN NAVIGATION and CONTENT */
 #main-wrapper {
   position: relative;
+  display: flex;
+  flex-direction: row;
+  flex: 1 0 auto;
+}
+#main {
+  display: flex;
+  flex-direction: column;
+  flex: 1 1 auto;
+  overflow: hidden;
 }
 /* NAVIGATION / SIDE DRAWER */
 #navigation-drawer {
@@ -1724,6 +1744,10 @@ ul.form-list textarea {
 ul.form-list textarea.big-textarea {
   height: 24em;
 }
+ul.form-list .big-text-area-message {
+  border-radius: 0;
+  margin-top: -2px;
+}
 ul.form-list li.field-stack textarea {
   margin: 0;
   width: 100%;
@@ -3076,7 +3100,8 @@ html.density-large .field-data {
   align-items: center;
 }
 /* FOOTER */
-footer {
+#comanage-logo {
   text-align: center;
-  padding: 2em 2em 1em;
+  padding: 0 0 2em;
+  margin-top: auto;
 }
diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css
index 4f776508d..e904e3a94 100644
--- a/app/webroot/css/co-responsive.css
+++ b/app/webroot/css/co-responsive.css
@@ -159,21 +159,6 @@
   #co-hamburger {
     display: none;
   }
-  /* CONTENT LAYOUT */
-  #comanage-wrapper {
-    display: flex;
-    flex-direction: column;
-    height: 100vh;
-  }
-  #main-wrapper {
-    display: flex;
-    flex-direction: row;
-    flex: 1;
-  }
-  #main {
-    flex-basis: 100%;
-    padding-bottom: 66px; /* offset for footer logo height */
-  }
   /* HEADER */
   #logo {
     margin-top: 8px;
@@ -264,12 +249,22 @@
   }
   /* MAIN MENU */
   #navigation-drawer {
-    display: block;
+    display: flex;
+    flex-direction: column;
     position: relative;
     top: unset;
     z-index: unset;
     border-bottom: none;
   }
+  #navigation {
+    flex: 1 1 auto;
+  }
+  #navigation-bottom {
+    position: sticky;
+    bottom: 0;
+    flex: 0 0 auto;
+    z-index: 100;
+  }
   #main-menu {
     text-align: center;
     font-size: 0.9em;
@@ -623,25 +618,13 @@
     gap: 1em;
   }
   /* FOOTER */
-  #co-footer {
-    position: static;
+  #comanage-logo {
     text-align: right;
-    padding: 0;
-    margin-top: -72px;
-    transform: unset;
+    padding: 0 0 1em;
   }
   .poweredByComanage {
     display: inline-block;
-    padding: 1em 2em 2em 0;
-  }
-  body.logged-out #co-footer {
-    position: fixed;
-    float: none;
-    right: 0;
-    bottom: 0;
-    margin: 0;
-    left: unset;
-    transform: unset;
+    padding: 1em 2em 1em 0;
   }
 }
 
@@ -718,21 +701,19 @@
 }
 
 /* SPECIAL */
-@media only screen and (min-height: 556px) and (min-width: 768px) {
-  #navigation-drawer.closed #navigation-bottom {
-    position: fixed;
-    bottom: 0;
-    left: 2px;
-    width: auto;
-    margin-top: 0;
+@media only screen and (max-height: 696px) and (min-width: 768px){
+  #navigation-drawer.open #navigation {
+    flex: 0 0 auto;
+  }
+  #navigation-drawer.open #navigation-bottom {
+    position: static;
   }
 }
-@media only screen and (min-height: 728px) and (min-width: 768px){
-  #navigation-bottom {
-    position: fixed;
-    bottom: 0;
-    left: 8px;
-    width: auto;
-    margin-top: 0;
+@media only screen and (max-height: 540px) and (min-width: 768px) {
+  #navigation-drawer.closed #navigation {
+    flex: 0 0 auto;
   }
-}
\ No newline at end of file
+  #navigation-drawer.closed #navigation-bottom {
+    position: static;
+  }
+}