diff --git a/.classpath b/.classpath
index f35cf398..e1f7ee49 100644
--- a/.classpath
+++ b/.classpath
@@ -22,13 +22,29 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 00000000..b63b642c
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..0a814d5d
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="posters-demo-store" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..63e90019
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 00000000..712ab9d9
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..0abcc97c
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.project b/.project
index e45b1efd..fabdbc78 100644
--- a/.project
+++ b/.project
@@ -39,4 +39,15 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1680755969575</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 7eb0104f..51dff5d6 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -21,8 +21,9 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=18
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
diff --git a/src/main/java/assets/images_fw/about.jpg b/src/main/java/assets/images_fw/about.jpg
new file mode 100644
index 00000000..c9ab0803
Binary files /dev/null and b/src/main/java/assets/images_fw/about.jpg differ
diff --git a/src/main/java/assets/images_fw/blog-1.jpg b/src/main/java/assets/images_fw/blog-1.jpg
new file mode 100644
index 00000000..35a41a07
Binary files /dev/null and b/src/main/java/assets/images_fw/blog-1.jpg differ
diff --git a/src/main/java/assets/images_fw/blog-2.jpg b/src/main/java/assets/images_fw/blog-2.jpg
new file mode 100644
index 00000000..ddc30f0b
Binary files /dev/null and b/src/main/java/assets/images_fw/blog-2.jpg differ
diff --git a/src/main/java/assets/images_fw/blog-3.jpg b/src/main/java/assets/images_fw/blog-3.jpg
new file mode 100644
index 00000000..5c251960
Binary files /dev/null and b/src/main/java/assets/images_fw/blog-3.jpg differ
diff --git a/src/main/java/assets/images_fw/brand-1.jpg b/src/main/java/assets/images_fw/brand-1.jpg
new file mode 100644
index 00000000..89e0b33a
Binary files /dev/null and b/src/main/java/assets/images_fw/brand-1.jpg differ
diff --git a/src/main/java/assets/images_fw/brand-2.jpg b/src/main/java/assets/images_fw/brand-2.jpg
new file mode 100644
index 00000000..8adc73ea
Binary files /dev/null and b/src/main/java/assets/images_fw/brand-2.jpg differ
diff --git a/src/main/java/assets/images_fw/brand-3.jpg b/src/main/java/assets/images_fw/brand-3.jpg
new file mode 100644
index 00000000..b62b96ff
Binary files /dev/null and b/src/main/java/assets/images_fw/brand-3.jpg differ
diff --git a/src/main/java/assets/images_fw/brand-4.jpg b/src/main/java/assets/images_fw/brand-4.jpg
new file mode 100644
index 00000000..a2c85504
Binary files /dev/null and b/src/main/java/assets/images_fw/brand-4.jpg differ
diff --git a/src/main/java/assets/images_fw/brand-5.jpg b/src/main/java/assets/images_fw/brand-5.jpg
new file mode 100644
index 00000000..0a4855d9
Binary files /dev/null and b/src/main/java/assets/images_fw/brand-5.jpg differ
diff --git a/src/main/java/assets/images_fw/cover-img-1.jpg b/src/main/java/assets/images_fw/cover-img-1.jpg
new file mode 100644
index 00000000..718b06b0
Binary files /dev/null and b/src/main/java/assets/images_fw/cover-img-1.jpg differ
diff --git a/src/main/java/assets/images_fw/img_bg_1.jpg b/src/main/java/assets/images_fw/img_bg_1.jpg
new file mode 100644
index 00000000..3b412e82
Binary files /dev/null and b/src/main/java/assets/images_fw/img_bg_1.jpg differ
diff --git a/src/main/java/assets/images_fw/img_bg_2.jpg b/src/main/java/assets/images_fw/img_bg_2.jpg
new file mode 100644
index 00000000..bb23bfeb
Binary files /dev/null and b/src/main/java/assets/images_fw/img_bg_2.jpg differ
diff --git a/src/main/java/assets/images_fw/img_bg_3.jpg b/src/main/java/assets/images_fw/img_bg_3.jpg
new file mode 100644
index 00000000..2821944a
Binary files /dev/null and b/src/main/java/assets/images_fw/img_bg_3.jpg differ
diff --git a/src/main/java/assets/images_fw/item-1.jpg b/src/main/java/assets/images_fw/item-1.jpg
new file mode 100644
index 00000000..bb478afd
Binary files /dev/null and b/src/main/java/assets/images_fw/item-1.jpg differ
diff --git a/src/main/java/assets/images_fw/item-10.jpg b/src/main/java/assets/images_fw/item-10.jpg
new file mode 100644
index 00000000..7bd58a71
Binary files /dev/null and b/src/main/java/assets/images_fw/item-10.jpg differ
diff --git a/src/main/java/assets/images_fw/item-11.jpg b/src/main/java/assets/images_fw/item-11.jpg
new file mode 100644
index 00000000..ca4b0b2c
Binary files /dev/null and b/src/main/java/assets/images_fw/item-11.jpg differ
diff --git a/src/main/java/assets/images_fw/item-12.jpg b/src/main/java/assets/images_fw/item-12.jpg
new file mode 100644
index 00000000..12e6fe6e
Binary files /dev/null and b/src/main/java/assets/images_fw/item-12.jpg differ
diff --git a/src/main/java/assets/images_fw/item-13.jpg b/src/main/java/assets/images_fw/item-13.jpg
new file mode 100644
index 00000000..a2c02c08
Binary files /dev/null and b/src/main/java/assets/images_fw/item-13.jpg differ
diff --git a/src/main/java/assets/images_fw/item-14.jpg b/src/main/java/assets/images_fw/item-14.jpg
new file mode 100644
index 00000000..53a6ebbd
Binary files /dev/null and b/src/main/java/assets/images_fw/item-14.jpg differ
diff --git a/src/main/java/assets/images_fw/item-15.jpg b/src/main/java/assets/images_fw/item-15.jpg
new file mode 100644
index 00000000..52cb9330
Binary files /dev/null and b/src/main/java/assets/images_fw/item-15.jpg differ
diff --git a/src/main/java/assets/images_fw/item-16.jpg b/src/main/java/assets/images_fw/item-16.jpg
new file mode 100644
index 00000000..abacb2be
Binary files /dev/null and b/src/main/java/assets/images_fw/item-16.jpg differ
diff --git a/src/main/java/assets/images_fw/item-2.jpg b/src/main/java/assets/images_fw/item-2.jpg
new file mode 100644
index 00000000..aaf5ec4b
Binary files /dev/null and b/src/main/java/assets/images_fw/item-2.jpg differ
diff --git a/src/main/java/assets/images_fw/item-3.jpg b/src/main/java/assets/images_fw/item-3.jpg
new file mode 100644
index 00000000..29f5830a
Binary files /dev/null and b/src/main/java/assets/images_fw/item-3.jpg differ
diff --git a/src/main/java/assets/images_fw/item-4.jpg b/src/main/java/assets/images_fw/item-4.jpg
new file mode 100644
index 00000000..4a784d22
Binary files /dev/null and b/src/main/java/assets/images_fw/item-4.jpg differ
diff --git a/src/main/java/assets/images_fw/item-5.jpg b/src/main/java/assets/images_fw/item-5.jpg
new file mode 100644
index 00000000..9b04e59c
Binary files /dev/null and b/src/main/java/assets/images_fw/item-5.jpg differ
diff --git a/src/main/java/assets/images_fw/item-6.jpg b/src/main/java/assets/images_fw/item-6.jpg
new file mode 100644
index 00000000..c06c77ff
Binary files /dev/null and b/src/main/java/assets/images_fw/item-6.jpg differ
diff --git a/src/main/java/assets/images_fw/item-7.jpg b/src/main/java/assets/images_fw/item-7.jpg
new file mode 100644
index 00000000..e7a03624
Binary files /dev/null and b/src/main/java/assets/images_fw/item-7.jpg differ
diff --git a/src/main/java/assets/images_fw/item-8.jpg b/src/main/java/assets/images_fw/item-8.jpg
new file mode 100644
index 00000000..e0a3bfae
Binary files /dev/null and b/src/main/java/assets/images_fw/item-8.jpg differ
diff --git a/src/main/java/assets/images_fw/item-9.jpg b/src/main/java/assets/images_fw/item-9.jpg
new file mode 100644
index 00000000..bb7380c0
Binary files /dev/null and b/src/main/java/assets/images_fw/item-9.jpg differ
diff --git a/src/main/java/assets/images_fw/loader.gif b/src/main/java/assets/images_fw/loader.gif
new file mode 100644
index 00000000..317182d0
Binary files /dev/null and b/src/main/java/assets/images_fw/loader.gif differ
diff --git a/src/main/java/assets/images_fw/loc.png b/src/main/java/assets/images_fw/loc.png
new file mode 100644
index 00000000..c9e2381a
Binary files /dev/null and b/src/main/java/assets/images_fw/loc.png differ
diff --git a/src/main/java/assets/images_fw/men.jpg b/src/main/java/assets/images_fw/men.jpg
new file mode 100644
index 00000000..6d93b248
Binary files /dev/null and b/src/main/java/assets/images_fw/men.jpg differ
diff --git a/src/main/java/assets/images_fw/person1.jpg b/src/main/java/assets/images_fw/person1.jpg
new file mode 100644
index 00000000..e106292c
Binary files /dev/null and b/src/main/java/assets/images_fw/person1.jpg differ
diff --git a/src/main/java/assets/images_fw/person2.jpg b/src/main/java/assets/images_fw/person2.jpg
new file mode 100644
index 00000000..c81ca981
Binary files /dev/null and b/src/main/java/assets/images_fw/person2.jpg differ
diff --git a/src/main/java/assets/images_fw/person3.jpg b/src/main/java/assets/images_fw/person3.jpg
new file mode 100644
index 00000000..7f75f53d
Binary files /dev/null and b/src/main/java/assets/images_fw/person3.jpg differ
diff --git a/src/main/java/assets/images_fw/women.jpg b/src/main/java/assets/images_fw/women.jpg
new file mode 100644
index 00000000..6e6cf173
Binary files /dev/null and b/src/main/java/assets/images_fw/women.jpg differ
diff --git a/src/main/java/views/WebShopController/index.ftl.html b/src/main/java/views/WebShopController/index.ftl.html
index 1b04a032..3aeec96d 100644
--- a/src/main/java/views/WebShopController/index.ftl.html
+++ b/src/main/java/views/WebShopController/index.ftl.html
@@ -1,5 +1,32 @@
 <#import "../layout/defaultLayoutWebShop.ftl.html" as layout>
 <@layout.myLayout "The ultimate webshop">
+<aside id="colorlib-hero">
+	<div class="flexslider">
+		<ul class="slides">
+			<#list carousel as caro>  <#if (caro_index == 0)>
+				<li class="active" style="background-image: url('${contextPath}${caro.imageURL}');" >
+					<#else>
+					<li class="" style="background-image: url('${contextPath}${caro.imageURL}');" >
+					</#if>
+					<div class="overlay"></div>
+					<div class="container-fluid">
+						<div class="row">
+							<div class="col-sm-6 offset-sm-3 text-center slider-text">
+								<div class="slider-text-inner">
+									<div class="desc">
+										<h1 class="head-1">${caro.name}</h1>
+										<p><a href="${contextPath}/productDetail/${caro.name?url('UTF-8')}?productId=${caro.id}" class="btn btn-primary">Buy</a></p>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</li>
+			</#list>
+		</ul>
+	</div>
+</aside>
+<!--
 <div class="row">
 	<div class="col-xs-12">
 		<div class="header-container">
@@ -8,8 +35,10 @@
 	</div>
 	<div class="col-xs-12">
 		<div id="pShopCarousel" class="carousel slide" data-ride="carousel">
-
+-->
 			<!-- Indicators -->
+<!--
+
 			<ol class="carousel-indicators">
 				<#list carousel as caro> <#if (caro_index == 0)>
 				<li data-target="#pShopCarousel" data-slide-to="0" class="active"></li>
@@ -17,9 +46,11 @@
 				<li data-target="#pShopCarousel" data-slide-to="${caro_index}"></li>
 				</#if> </#list>
 			</ol>
+-->
 
 			<!-- Wrapper for slides -->
-			<div class="carousel-inner" role="listbox">
+<!--
+		<div class="carousel-inner" role="listbox">
 				<#list carousel as caro> <#if (caro_index == 0)>
 				<div id="pShopCarouselItem${caro_index}" class="item active">
 					<#else>
@@ -36,8 +67,10 @@
 					</#list>
 				</div>
 			</div>
+		-->
 
 			<!-- Left and right controls; Carousel nav -->
+<!--
 			<a id="btnCarouselPrev" class="left carousel-control"
 				href="#pShopCarousel" role="button" data-slide="prev"> <span
 				class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
@@ -48,9 +81,13 @@
 				<span class="sr-only">Next</span>
 			</a>
 
-		</div>
 </div>
 
+</div>
+-->
+
+
+<!--Homepage Product Samples-->
 <div class="margin_top20 row">
 	<div class="col-xs-12">
 		<div class="header-container">
diff --git a/src/main/java/views/layout/defaultLayoutWebShop.ftl.html b/src/main/java/views/layout/defaultLayoutWebShop.ftl.html
index 57bbbb72..8c120c89 100644
--- a/src/main/java/views/layout/defaultLayoutWebShop.ftl.html
+++ b/src/main/java/views/layout/defaultLayoutWebShop.ftl.html
@@ -68,7 +68,6 @@
 	</header>
 
 	<!-- main/content -->
-	<div class="body-wrapper">
 		<main> <!-- message: no java script -->
 		<noscript>
 			<div class="section">
@@ -96,9 +95,9 @@
 		</div>
 
 		<!-- body -->
-		<div class="container-fluid" id="main"><#nested/></div>
+		<div class="" id="main"><#nested/></div>
 		</main>
-	</div>
+	
 	<!-- footer -->
 	<#include "footer.ftl.html"/>
 
diff --git a/src/main/java/views/layout/header.ftl.html b/src/main/java/views/layout/header.ftl.html
index 4ca14ada..9785c68c 100644
--- a/src/main/java/views/layout/header.ftl.html
+++ b/src/main/java/views/layout/header.ftl.html
@@ -128,9 +128,34 @@ <h3><a href="#">Our biggest sale yet 50% off all Posters</a></h3>
 		</div>
 	</div>
 </nav>
-<br><br><br><br><br><br><br><br><br><br><br><br>
+<aside id="colorlib-hero">
+	<div class="flexslider">
+		<ul class="slides">
+			<#list carousel as caro>  <#if (caro_index == 0)>
+				<li class="active" style="background-image: url('${contextPath}${caro.imageURL}');" >
+					<#else>
+					<li class="" style="background-image: url('${contextPath}${caro.imageURL}');" >
+					</#if>
+					<div class="overlay"></div>
+					<div class="container-fluid">
+						<div class="row">
+							<div class="col-sm-6 offset-sm-3 text-center slider-text">
+								<div class="slider-text-inner">
+									<div class="desc">
+										<h1 class="head-1" style="color: black;">${caro.name}</h1>
+										<p><a href="${contextPath}/productDetail/${caro.name?url('UTF-8')}?productId=${caro.id}" class="btn btn-primary">Buy</a></p>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</li>
+			</#list>
+		</ul>
+	</div>
+</aside>
 
-<nav id="globalNavigation"
+	<nav id="globalNavigation"
 	class="navbar navbar-default navbar-static-top">
 	<div class="container-fluid">
 		<div class="row">
@@ -315,4 +340,4 @@ <h3><a href="#">Our biggest sale yet 50% off all Posters</a></h3>
 			</ul>
 		</div>
 	</div>
-</nav>
\ No newline at end of file
+</nav> 
\ No newline at end of file