diff --git a/page.php b/page.php
index 2b4d1c59..8e2c188a 100644
--- a/page.php
+++ b/page.php
@@ -13,13 +13,28 @@
  get_header();
 ?>
 
+<?php
+$container = get_theme_mod('understrap_container_type');
+$sidebar_pos = get_theme_mod('understrap_sidebar_position');
+?>
+
 <div class="wrapper" id="page-wrapper">
 
-  <div class="container" id="content">
+  <div class="<?php echo $container?>" id="content">
 
     <div class="row">
+	    <?php if ( 'left' === $sidebar_pos || 'both' === $sidebar_pos ): ?>
+		    <?php get_sidebar( 'left' ); ?>
+	    <?php endif; ?>
+
+	    <?php if ( 'right' === $sidebar_pos || 'left' === $sidebar_pos ): ?>
+      <div class="<?php if ( is_active_sidebar( 'right-sidebar' ) || is_active_sidebar( 'left-sidebar' )) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area" id="primary">
+
+		<?php elseif ( is_active_sidebar( 'right-sidebar' ) && is_active_sidebar( 'left-sidebar' ) ): ?>
+        <div class="<?php if ( 'both' === $sidebar_pos ) : ?>col-md-6<?php else : ?>col-md-12<?php endif; ?> content-area" id="primary">
+	      <?php endif; ?>
+
 
-      <div class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area" id="primary">
 
         <main class="site-main" id="main" role="main">
 
@@ -39,8 +54,9 @@
         </main><!-- #main -->
 
       </div><!-- #primary -->
-
-      <?php get_sidebar(); ?>
+      <?php if ( 'right' === $sidebar_pos || 'both' === $sidebar_pos ): ?>
+	      <?php get_sidebar( 'right' ); ?>
+    <?php endif; ?>
 
     </div><!-- .row -->