diff --git a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb b/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
index a22564d8f..c0774b5de 100644
--- a/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
+++ b/modules/vulnerabilities/unix/webapp/parameterised_website/templates/subtemplates/tab_panel.html.erb
@@ -1,13 +1,12 @@
-<div id="main_container" class="container">
-  <div id="tabs">
-    <ul class="nav nav-tabs">
-      <li class="nav-item active"><a class="nav-link active" data-toggle="tab" href="#tabs-1">Start here!</a></li>
-      <% @visible_tabs.each_with_index{ |_, counter| -%>
-      <li class="nav-item"><a class="nav-link" data-toggle="tab" href="tab_<%=counter + 1 %>.html"><%=counter + 1 %></a></li>
-      <%} -%>
-    </ul>
-    <div id="tabs-1">
-      <p>Here's some default content that will be replaced by a some content.</p>
-    </div>
+<div id="tabs">
+  <ul class="nav nav-tabs">
+    <li class="nav-item active"><a class="nav-link active" data-toggle="tab" href="#tabs-1">Start here!</a></li>
+    <% @visible_tabs.each_with_index { |_, counter| -%>
+        <li class="nav-item">
+          <a class="nav-link" data-toggle="tab" href="tab_<%= counter + 1 %>.html"><%= counter + 1 %></a></li>
+    <% } -%>
+  </ul>
+  <div id="tabs-1">
+
   </div>
 </div>
\ No newline at end of file
diff --git a/scenarios/ctf/edge_hill_scenario.xml b/scenarios/ctf/edge_hill_scenario.xml
index b29677d17..447d9ea33 100644
--- a/scenarios/ctf/edge_hill_scenario.xml
+++ b/scenarios/ctf/edge_hill_scenario.xml
@@ -12,89 +12,107 @@
 		<!-- comment describes using pseudo code (C#-like methods with named optional arguments) -->
 		<!-- vulnerability_nfs_share_leak(strings_to_leak: encoder_flag_generator() CONCAT encoder_ascii_reversable(strings_to_encode: encoder_flag_generator()) CONCAT ...) -->
 		<vulnerability name="Random Parameterised Website">
-			<input into="visible_tabs" unique_module_list="unique_encoders">
-				<generator type="html_snippet_generator"/>
-				<value>This is another tab!</value>
-				<value>This is another tab!!!!</value>
+			<input into="visible_tabs">
+				<generator type="html_snippet_generator" >
+					<input into="heading">
+						<value>Challenge 1</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<encoder type="ascii_reversable">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</encoder>
+					</input>
+				</generator>
+
+				<generator type="html_snippet_generator">
+					<input into="heading">
+						<value>Challenge 2</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<encoder type="alpha_reversable">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</encoder>
+					</input>
+				</generator>
+
+				<generator type="html_snippet_generator">
+					<input into="heading">
+						<value>Challenge 3</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<encoder type="ascii_reversable">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</encoder>
+					</input>
+				</generator>
+
+				<generator type="html_snippet_generator">
+					<input into="heading">
+						<value>Challenge 4</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<encoder type="alpha_reversable">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</encoder>
+					</input>
+				</generator>
+
+				<generator type="html_snippet_generator">
+					<input into="heading">
+						<value>Challenge 5</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<generator type="ctf_challenge">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</generator>
+					</input>
+				</generator>
+
+				<generator type="html_snippet_generator">
+					<input into="heading">
+						<value>Challenge 6</value>
+					</input>
+					<input into="paragraphs" unique_module_list="unique_encoders">
+						<generator type="ctf_challenge">
+							<input into="strings_to_encode">
+								<generator type="flag_generator" />
+							</input>
+						</generator>
+					</input>
+				</generator>
 			</input>
+
 			<input into="hidden_tabs" unique_module_list="unique_encoders">
-				<value>this shows on tab_0.html</value>
-				<value>this shows on tab_4.html</value>
+				<generator type="flag_generator" />
+				<encoder type="ascii_reversable">
+					<input into="strings_to_encode" unique_module_list="unique_encoders">
+						<generator type="flag_generator" />
+					</input>
+				</encoder>
 			</input>
 
-			<!--<input into="hidden_tabs">-->
-				<!--<generator type="flag_generator" />-->
-				<!--<encoder type="alpha_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-			<!--</input>-->
-
-
-				<!--<encoder type="ascii_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-				<!--<encoder type="alpha_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-				<!--<encoder type="ascii_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-				<!--<encoder type="ascii_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-				<!--<encoder type="ascii_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-
-				<!--<encoder type="alpha_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</encoder>-->
-				<!--<generator type="ctf_challenge">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</generator>-->
-				<!--<generator type="ctf_challenge">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</generator>-->
-				<!--<encoder type="ascii_reversable">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<encoder type="ascii_reversable">-->
-							<!--<input into="strings_to_encode">-->
-								<!--<generator type="flag_generator" />-->
-							<!--</input>-->
-						<!--</encoder>-->
-					<!--</input>-->
-				<!--</encoder>-->
-			<!--</input>-->
-			<!--<input into="images_to_leak">-->
-				<!--<generator type="image_challenge_generator">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</generator>-->
-				<!--<generator type="image_challenge_generator">-->
-					<!--<input into="strings_to_encode">-->
-						<!--<generator type="flag_generator" />-->
-					<!--</input>-->
-				<!--</generator>-->
-			<!--</input>-->
+			<input into="images_to_leak" unique_module_list="unique_encoders">
+				<generator type="image_challenge_generator">
+					<input into="strings_to_encode">
+						<generator type="flag_generator" />
+					</input>
+				</generator>
+				<generator type="image_challenge_generator" >
+					<input into="strings_to_encode">
+						<generator type="flag_generator" />
+					</input>
+				</generator>
+			</input>
 		</vulnerability>
 
 		<network module_path=".*private_network_1"/>