diff --git a/support/tool/CRAFT/index.php b/support/tool/CRAFT/index.php
index 19b1a5380fa45182a3c4cc51bd1adb7c2f02d162..0eb9a5b96424910638d1a12b0b7b18771bf16035 100644
--- a/support/tool/CRAFT/index.php
+++ b/support/tool/CRAFT/index.php
@@ -32,6 +32,7 @@
 			else if($_SESSION['start_tabblad'] == 4)
 				$startpagina = $startpagina . "&s=" . $_SESSION['start_stats'];
   		
+  		
   		header("Location: ". $_SESSION['pagina'] ."main.php" . $startpagina);
 
   	}
@@ -45,18 +46,19 @@
 	<div id="hoofdscherm">
 		<br><center><h2>Inlogscherm</h2></center>
 
-		<center><form name="inloggen" method="post" action="<?php echo($php_self); ?>">
-			<table>
-				<tr>
-					<td>Inlognaam:</td><td><INPUT name="gebruiker"></td>
-				</tr>
-				<tr>
-					<td>Wachtwoord:</td><td><INPUT name="wachtwoord" type="password"></td>
-				</tr>
-			</table>
+		<center>
+			<form name="inloggen" method="post" action="<?php echo($php_self); ?>">
+				<table>
+					<tr>
+						<td>Inlognaam:</td><td><INPUT name="gebruiker"></td>
+					</tr>
+					<tr>
+						<td>Wachtwoord:</td><td><INPUT name="wachtwoord" type="password"></td>
+					</tr>
+				</table>
 
-			<BUTTON NAME="submit" type="submit" value="Login">Login</BUTTON>
-		</form>
+				<BUTTON NAME="submit" type="submit" value="Login">Login</BUTTON>
+			</form>
 		<?php 
 			//er is iets fouts gegaan met het inloggen, dus een melding tonen
 			if ($feedback != '') echo("<p class=\"foutmelding\">". $feedback. "</p>");
diff --git a/support/tool/CRAFT/main.php b/support/tool/CRAFT/main.php
index 2d0f4f1d480366f1a41eb919016e523e01e3f524..e29864898d06c20cdcfc43769b830627d1408006 100644
--- a/support/tool/CRAFT/main.php
+++ b/support/tool/CRAFT/main.php
@@ -24,7 +24,7 @@
     		//TODO controleren of die pagina wel geladen mag worden!!!!!!!
  		  	
  		  	//de P van de versturende ophalen. als deze anders is dan de P waar die heen moet,
- 		  	//dan de startpagina openen
+ 		  	//dan de startpagina openen, ALLEEN NIET WANNEER DEZE AFKOMSTIG IS VAN EEN OVERZICHT!!!
  		  	
  		  	//?p=
  		  	//echo($_SERVER['HTTP_REFERER']);
@@ -33,7 +33,9 @@
     		
     		$pagina = $_GET['p'];
 
-    		if ($pagina != $vorige_pagina) {
+				if (isset($_GET['bypass']) && $_GET['bypass'])
+					$start = $_GET['s'];
+				else if ($pagina != $vorige_pagina) {
 					if($pagina == 2)
 						$start = $_SESSION['start_comp'];
 					else if($pagina == 3)
diff --git a/support/tool/CRAFT/main_componenten/Comp_Overzicht.php b/support/tool/CRAFT/main_componenten/Comp_Overzicht.php
index 541d2899c07b3842d0adfe5ea629d1ed081f4007..3e1d2af6290eeb265986e9435bd06ee17760abeb 100644
--- a/support/tool/CRAFT/main_componenten/Comp_Overzicht.php
+++ b/support/tool/CRAFT/main_componenten/Comp_Overzicht.php
@@ -20,7 +20,14 @@
 					$row = mysql_fetch_array($res);
 					
 					echo("<tr><td>".$data['Comp_Lijst_ID']."</td><td>".substr($data['Comp_Naam'], 0, 40)."...</td><td>". $row['Loc_Naam'] ."</td>");
-					echo("<td><a href=\"../". $_SESSION['huidige_pagina']."&o=1&c=". $data['Comp_Lijst_ID'] ."\" target=\"_top\">Info</a></td></tr>");
+
+					$id = substr($_SESSION['huidige_pagina'], (strpos ($_SESSION['huidige_pagina'], "p=") + 2 ), 1);
+					$temp = $_SESSION['huidige_pagina'];
+					$temp = str_replace("p=".$id  , "p=2", $temp);
+					$_SESSION['type_overzicht'] = 1;
+
+					//p=1 > p=2
+					echo("<td><a href=\"../". $temp."&bypass=1&c=". $data['Comp_Lijst_ID'] ."\" target=\"_top\">Info</a></td></tr>");
 				}
 				echo("</table>");
 			?>
diff --git a/support/tool/CRAFT/main_componenten/Type_Overzicht.php b/support/tool/CRAFT/main_componenten/Type_Overzicht.php
index a3918c1fc657065e6dbf67cf4e1925e9bc35a11d..c787f4a14004c2949f71c3f9b06e17a05157a5cd 100644
--- a/support/tool/CRAFT/main_componenten/Type_Overzicht.php
+++ b/support/tool/CRAFT/main_componenten/Type_Overzicht.php
@@ -17,7 +17,13 @@
 				echo("<table border=\"1\">");
 				while ($data = mysql_fetch_array($resultaat)) {
 					echo("<tr><td>". $data['Comp_Type'] ."</td><td>".substr($data['Type_Naam'], 0, 40)."...</td>");
-					echo("<td><a href=\"../". $_SESSION['huidige_pagina']."&o=2&c=". $data['Comp_Type']."\" target=\"_top\">Info</a></td></tr>");
+
+					$id = substr($_SESSION['huidige_pagina'], (strpos ($_SESSION['huidige_pagina'], "p=") + 2 ), 1);
+					$temp = $_SESSION['huidige_pagina'];
+					$temp = str_replace("p=".$id  , "p=2", $temp);
+					$_SESSION['type_overzicht'] = 1;
+					//p=1 > p=2
+					echo("<td><a href=\"../". $temp."&bypass=1&o=2&c=". $data['Comp_Type']."\" target=\"_top\">Info</a></td></tr>");
 				}
 				echo("</table>");
 
diff --git a/support/tool/CRAFT/main_meldingen/Meldingen_Overzicht.php b/support/tool/CRAFT/main_meldingen/Meldingen_Overzicht.php
index 1ce2059ea0f034f67484d5ad83e9b8e2209b84e2..c2f1605f11747274662422ef7af30e521d3993ca 100644
--- a/support/tool/CRAFT/main_meldingen/Meldingen_Overzicht.php
+++ b/support/tool/CRAFT/main_meldingen/Meldingen_Overzicht.php
@@ -31,9 +31,10 @@
 					$id = substr($_SESSION['huidige_pagina'], (strpos ($_SESSION['huidige_pagina'], "p=") + 2 ), 1);
 					$temp = $_SESSION['huidige_pagina'];
 					$temp = str_replace("p=".$id  , "p=3", $temp);
+					$_SESSION['type_overzicht'] = 1;
 
 					//p=1 > p=3
-					echo("  <a href=\"../". $temp."&c=".$data['Comp_Lijst_ID'] . "&m=" . $data['Meld_Lijst_ID']."\" target=\"_top\">Info</a></td></tr>");
+					echo("  <a href=\"../". $temp."&bypass=1&c=".$data['Comp_Lijst_ID'] . "&m=" . $data['Meld_Lijst_ID']."\" target=\"_top\">Info</a></td></tr>");
 				}
 				echo("</table>");
 			?>