diff --git a/modules/custom/az_flexible_page/az_flexible_page.libraries.yml b/modules/custom/az_flexible_page/az_flexible_page.libraries.yml
index 26dfd3c49e..11be736839 100644
--- a/modules/custom/az_flexible_page/az_flexible_page.libraries.yml
+++ b/modules/custom/az_flexible_page/az_flexible_page.libraries.yml
@@ -1,4 +1,8 @@
 az_flexible_page_form:
   css:
     base:
-      css/az-flexible-page-edit-form.css: {}
\ No newline at end of file
+      css/az-flexible-page-edit-form.css: {}
+az_flexible_page_theme:
+  css:
+    layout:
+      css/az_flexible_page.theme.css: {}
diff --git a/modules/custom/az_flexible_page/az_flexible_page.module b/modules/custom/az_flexible_page/az_flexible_page.module
index 70403ff92a..e64d030ffb 100644
--- a/modules/custom/az_flexible_page/az_flexible_page.module
+++ b/modules/custom/az_flexible_page/az_flexible_page.module
@@ -8,6 +8,13 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\EntityFormInterface;
 
+/**
+ * Implements hook_preprocess_node().
+ */
+function az_flexible_page_preprocess_node__az_flexible_page(&$variables) {
+  $variables['#attached']['library'][] = 'az_flexible_page/az_flexible_page_theme';
+}
+
 /**
  * Implements hook_form_alter().
  */
diff --git a/modules/custom/az_flexible_page/css/az_flexible_page.theme.css b/modules/custom/az_flexible_page/css/az_flexible_page.theme.css
new file mode 100644
index 0000000000..83ecef27f4
--- /dev/null
+++ b/modules/custom/az_flexible_page/css/az_flexible_page.theme.css
@@ -0,0 +1,9 @@
+/*
+*  Page-specific overrides to the theme defaults.
+*/
+
+.node__content {
+  /* Remove extra space at the top of content. */
+  margin-top: 0;
+}
+  
\ No newline at end of file
diff --git a/themes/custom/az_barrio/css/style.css b/themes/custom/az_barrio/css/style.css
index 8742670cda..1f92486d73 100644
--- a/themes/custom/az_barrio/css/style.css
+++ b/themes/custom/az_barrio/css/style.css
@@ -199,6 +199,13 @@ span.field-label {
   background-color: transparent;
 }
 
+/**
+ * General node styles (replacing Bootstrap Barrio node.css).
+ */
+.node__content {
+  margin-top: 10px;
+}
+
 /**
  * Unpublished note.
  */