diff --git a/src/org/april/agirstatool/core/pages/project.xhtml b/src/org/april/agirstatool/core/pages/project.xhtml
index 6b0f8a1..a151a2d 100644
--- a/src/org/april/agirstatool/core/pages/project.xhtml
+++ b/src/org/april/agirstatool/core/pages/project.xhtml
@@ -13,28 +13,38 @@
 <body>
 	<div style="margin: 10px;">	
 		<h1><a href="index.xhtml">Agir Statool</a> – <a id="agirLink" href="#">Project <span id="projectName">n/a</span></a></h1>
-		<div>
-			<div id="issueRawChart" style="display: inline-block;">ISSUES BAR CHART</div>
-			<div id="issueGroupedChart" style="display: inline-block;">ISSUES BAR CHART</div>
-			<div id="unassignedRawChart" style="display: inline-block;"></div>
-			<div id="unassignedGroupedChart" style="display: inline-block;"></div>
-			<br/>
-			<div id="issueRawChartAlone" style="display: inline-block;"></div>
-			<div id="issueGroupedChartAlone" style="display: inline-block;"></div>
-			<div id="unassignedRawChartAlone" style="display: inline-block;"></div>
-			<div id="unassignedGroupedChartAlone" style="display: inline-block;"></div>
+		<div style="margin: 4px;">
+			<span style="display: inline-block; padding-top: 6px; vertical-align: text-top;">Grouped</span>
+			<label class="switch">
+			    <input type="checkbox" onclick="javascript:projectsViewFlip();" />
+			    <span class="slider round"></span>
+			</label>
 		</div>
-		<br/>
-		<div>
-			<div style="margin: 4px;">
-				<span style="display: inline-block; padding-top: 6px; vertical-align: text-top;">Grouped</span>
-				<label class="switch">
-				    <input type="checkbox" onclick="javascript:projectsViewFlip();" />
-				    <span class="slider round"></span>
-				</label>
+		<div id="rawView">
+			<div>
+				<div id="issueRawChart" style="display: inline-block;">ISSUES BAR CHART</div>
+				<div id="unassignedRawChart" style="display: inline-block;"></div>
+				<br/>
+				<div id="issueRawChartAlone" style="display: inline-block;"></div>
+				<div id="unassignedRawChartAlone" style="display: inline-block;"></div>
+			</div>
+			<br/>
+			<div>
+				<div id="projectsRawView">RAW VIEW PLACE</div>
+			</div>
+		</div>
+		<div id="groupedView" style="display: none;">
+			<div>
+				<div id="issueGroupedChart" style="display: inline-block;">ISSUES BAR CHART</div>
+				<div id="unassignedGroupedChart" style="display: inline-block;"></div>
+				<br/>
+				<div id="issueGroupedChartAlone" style="display: inline-block;"></div>
+				<div id="unassignedGroupedChartAlone" style="display: inline-block;"></div>
+			</div>
+			<br/>
+			<div>
+				<div id="projectsGroupedView">GROUPED VIEW PLACE</div>
 			</div>
-			<div id="projectsRawView">RAW VIEW PLACE</div>
-			<div id="projectsGroupedView" style="display: none;"	>GROUPED VIEW PLACE</div>
 		</div>
     </div>
 	<script type="text/javascript">
@@ -44,14 +54,14 @@
 	{
 	    if (showRawView == true)
 	    {
-	        document.getElementById ('projectsRawView').style.display = 'none';
-	        document.getElementById ('projectsGroupedView').style.display = 'inline';
+	        document.getElementById ('rawView').style.display = 'none';
+	        document.getElementById ('groupedView').style.display = 'inline';
 	        showRawView = false;
 	    }
 	    else
 	    {
-	        document.getElementById ('projectsRawView').style.display = 'block';
-	        document.getElementById ('projectsGroupedView').style.display = 'none';
+	        document.getElementById ('rawView').style.display = 'block';
+	        document.getElementById ('groupedView').style.display = 'none';
 	        showRawView = true;
 	    }
 	}
