diff --git a/helper.php b/helper.php
index 37a422b..21a8058 100644
--- a/helper.php
+++ b/helper.php
@@ -55,7 +55,6 @@
 // Check upon the current page layout
 	$pagelayout = $this->params->get('pagelayout', '1column');
 
-	// Determine whether to show sidebar-A (@todo: Jisse, clean up this mess)
 		$SidebarA = false;
 		$SidebarB = false;
 
@@ -89,3 +88,13 @@
 		{
 			$pagelayout = '3column';
 		}
+
+		if($helper->isHome())
+		{
+			$pagelayout = 'homepage';
+		}
+
+
+
+
+
diff --git a/index.php b/index.php
index 5e5706f..e965e5a 100644
--- a/index.php
+++ b/index.php
@@ -15,19 +15,42 @@
 		</header>
 
 		<main>
-			<div class="container">
-				<div class="row">
-					<div class="col-sm-8 col-sm-push-4 col-md-9 col-md-push-3">
-						<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
-							<jdoc:include type="message" />
-						<?php endif; ?>
-						<jdoc:include type="component" />
-					</div>
-					<div class="col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9">
-						<jdoc:include type="modules" name="sidebar-a" style="none" />
-					</div>
-				</div>
-			</div>
+			<?php if ($this->countModules('content-top')): ?>
+			<aside>
+				<jdoc:include type="modules" name="content-top" style="no" />
+			</aside>
+			<?php endif; ?>
+
+			<?php
+				switch($pagelayout)
+				{
+					case 'homepage':
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/homepage.php';
+						break;
+
+					case '1column':
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/1column.php';
+						break;
+
+					case '2column-left':
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/2column-left.php';
+						break;
+
+					case '2column-right':
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/2column-right.php';
+						break;
+
+					case '3column':
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/3column.php';
+						break;
+
+					default:
+						include_once JPATH_THEMES.'/'.$this->template.'/pagelayout/1column.php';
+				}
+			?>
+			<?php if ($this->countModules('content-bottom')): ?>
+			<jdoc:include type="modules" name="content-bottom" style="no" />
+			<?php endif; ?>
 		</main>
 
 		<footer>
diff --git a/pagelayout/1column.php b/pagelayout/1column.php
new file mode 100644
index 0000000..c7040bd
--- /dev/null
+++ b/pagelayout/1column.php
@@ -0,0 +1,8 @@
+<?php
+defined('_JEXEC') or die;
+?>
+
+<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
+	<jdoc:include type="message" />
+<?php endif; ?>
+<jdoc:include type="component" />
\ No newline at end of file
diff --git a/pagelayout/2column-left.php b/pagelayout/2column-left.php
new file mode 100644
index 0000000..bbf9204
--- /dev/null
+++ b/pagelayout/2column-left.php
@@ -0,0 +1,17 @@
+<?php
+defined('_JEXEC') or die;
+?>
+
+<div class="container">
+	<div class="row">
+		<div class="col-sm-8 col-sm-push-4 col-md-9 col-md-push-3">
+			<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
+				<jdoc:include type="message" />
+			<?php endif; ?>
+			<jdoc:include type="component" />
+		</div>
+		<div class="col-sm-4 col-sm-pull-8 col-md-3 col-md-pull-9">
+			<jdoc:include type="modules" name="sidebar-a" style="none" />
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pagelayout/2column-right.php b/pagelayout/2column-right.php
new file mode 100644
index 0000000..0309bf9
--- /dev/null
+++ b/pagelayout/2column-right.php
@@ -0,0 +1,17 @@
+<?php
+defined('_JEXEC') or die;
+?>
+
+<div class="container">
+	<div class="row">
+		<div class="col-sm-8 col-md-9">
+			<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
+				<jdoc:include type="message" />
+			<?php endif; ?>
+			<jdoc:include type="component" />
+		</div>
+		<div class="col-sm-4 col-md-3">
+			<jdoc:include type="modules" name="sidebar-b" style="none" />
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pagelayout/3column.php b/pagelayout/3column.php
new file mode 100644
index 0000000..05b0a47
--- /dev/null
+++ b/pagelayout/3column.php
@@ -0,0 +1,20 @@
+<?php
+defined('_JEXEC') or die;
+?>
+
+<div class="container">
+	<div class="row">
+		<div class="col-sm-3 col-md-2">
+			<jdoc:include type="modules" name="sidebar-a" style="none" />
+		</div>
+		<div class="col-sm-6 col-md-8">
+			<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
+				<jdoc:include type="message" />
+			<?php endif; ?>
+			<jdoc:include type="component" />
+		</div>
+		<div class="col-sm-3 col-md-2">
+			<jdoc:include type="modules" name="sidebar-b" style="none" />
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/pagelayout/homepage.php b/pagelayout/homepage.php
new file mode 100644
index 0000000..c7040bd
--- /dev/null
+++ b/pagelayout/homepage.php
@@ -0,0 +1,8 @@
+<?php
+defined('_JEXEC') or die;
+?>
+
+<?php if(count(JFactory::getApplication()->getMessageQueue())):?>
+	<jdoc:include type="message" />
+<?php endif; ?>
+<jdoc:include type="component" />
\ No newline at end of file