diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index ffa372562..02f530983 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -35,121 +35,65 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	>
 <!-- Student DETAILS -->
-<vbox id="student-detail" style="margin:0px;">
-		<hbox style="background:#eeeeee;margin:0px;padding:2px">
-			<label value="Details" style="font-size:12pt;font-weight:bold;margin-top:5px;"  flex="1" />
-			<spacer flex="1" />
-			<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
-		</hbox>
+<vbox id="student-detail" style="margin:0px;" flex="1">
 		<vbox hidden="true">
 			<label value="Neu"/>
 			<checkbox id="student-detail-checkbox-new" checked="true" />      	
 			<label value="Person_id"/>
       		<textbox id="student-detail-textbox-person_id" disabled="true"/>					
 		</vbox>
-		<hbox flex="1">
-			<grid id="student-detail-grid" style="overflow:auto;margin:4px;" flex="1">
+		<vbox flex="1">
+		<groupbox id="student-detail-groupbox-person">
+			<caption label="Person" />
+			<grid id="student-detail-grid-person" style="overflow:auto;margin:4px;" flex="1">
 				  	<columns  >
     					<column flex="1"/>
     					<column flex="5"/>
-    					<column flex="3"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
   					</columns>
   					<rows>
     					<row>
       						<label value="UID" control="student-detail-textbox-uid"/>
       						<textbox id="student-detail-textbox-uid" disabled="true"/>
-    					</row>
-    					<row>
-      						<label value="Anrede" control="student-detail-textbox-anrede"/>
-      						<textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/>
-    					</row>
-    					<row>
-      						<label value="TitelPre" control="student-detail-textbox-titelpre"/>
-      						<textbox id="student-detail-textbox-titelpre" disabled="true" maxlength="64" size="64"/>
-    					</row>
-    					<row>
-      						<label value="TitelPost" control="student-detail-textbox-titelpost"/>
-      						<textbox id="student-detail-textbox-titelpost" disabled="true" maxlength="32"/>
-    					</row>
-    					<row>
-      						<label value="Vorname" control="student-detail-textbox-vorname"/>
-      						<textbox id="student-detail-textbox-vorname" disabled="true" maxlength="32"/>
-    					</row>
-    					<row>
-      						<label value="Vornamen" control="student-detail-textbox-vornamen"/>
-      						<textbox id="student-detail-textbox-vornamen" disabled="true" maxlength="128"/>
-    					</row>
-    					<row>
-      						<label value="Nachname" control="student-detail-textbox-nachname"/>
-      						<textbox id="student-detail-textbox-nachname" disabled="true" maxlength="64"/>
-    					</row>
-    					<row>
-      						<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
-      						<textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10"/>
-    					</row>
-    					<row>
-      						<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
-      						<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
-    					</row>
-    					<row>
-      						<label value="Geburtszeit" control="student-detail-textbox-geburtszeit"/>
-      						<textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5"/>
-    					</row>
-    					<row>
-      						<label value="Foto" />
-      						<hbox>
-      							<image src='' id="student-detail-image" width='60' height='60'/>
-      							<vbox>
-      							<button id="student-detail-button-image-upload" label="Bild upload" oncommand="StudentImageUpload();" disabled="true"/>
-      							</vbox>
-      							<spacer flex="1" />
-      						</hbox>
-    					</row>
-    					<row>
-      						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
-      						<textbox id="student-detail-textbox-anmerkung" disabled="true"/>
-    					</row>
-    					<row>
-      						<label value="Homepage" control="student-detail-textbox-homepage"/>
-      						<textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/>
-    					</row>
-    					<row>
-      						<label value="SVNR" control="student-detail-textbox-svnr"/>
-      						<textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10"/>
-    					</row>
-    					<row>
-      						<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
-      						<textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10"/>
-    					</row>
-    					<row>
-      						<label value="Familienstand" control="student-detail-menulist-familienstand"/>
-      						<menulist id="student-detail-menulist-familienstand" disabled="true">
-								<menupopup>
-										<menuitem value="g" label="geschieden"/>
-										<menuitem value="l" label="ledig"/>
-										<menuitem value="v" label="verheiratet"/>
-										<menuitem value="w" label="verwittwet"/>
-								</menupopup>								
-							</menulist>
-    					</row>
-    					<row>
-      						<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
-      						<menulist id="student-detail-menulist-geschlecht" disabled="true">
-								<menupopup>
-										<menuitem value="m" label="maennlich"/>
-										<menuitem value="w" label="weiblich"/>
-								</menupopup>								
-							</menulist>
-    					</row>
-    					<row>
+      						<spacer />
+      						<spacer />
       						<label value="Aktiv" control="student-detail-checkbox-aktiv"/>
       						<checkbox id="student-detail-checkbox-aktiv" checked="true" disabled="true"/>
     					</row>
     					<row>
-      						<label value="Anzahl der Kinder" control="student-detail-textbox-anzahlderkinder"/>
-      						<textbox id="student-detail-textbox-anzahlderkinder" disabled="true" maxlength="2"/>
+      						<label value="Anrede" control="student-detail-textbox-anrede"/>
+      						<textbox id="student-detail-textbox-anrede" disabled="true" maxlength="16" size="16"/>
+      						<label value="TitelPre" control="student-detail-textbox-titelpre"/>
+      						<textbox id="student-detail-textbox-titelpre" disabled="true" maxlength="64"/>
+      						<label value="TitelPost" control="student-detail-textbox-titelpost"/>
+      						<textbox id="student-detail-textbox-titelpost" disabled="true" maxlength="32"/>
     					</row>
-  						<row>
+    					<row>
+    						<label value="Nachname" control="student-detail-textbox-nachname"/>
+      						<textbox id="student-detail-textbox-nachname" disabled="true" maxlength="64"/>
+      						<label value="Vorname" control="student-detail-textbox-vorname"/>
+      						<textbox id="student-detail-textbox-vorname" disabled="true" maxlength="32"/>
+      						<label value="Vornamen" control="student-detail-textbox-vornamen"/>
+      						<textbox id="student-detail-textbox-vornamen" disabled="true" maxlength="128"/>
+    					</row>
+    					<row>
+      						<label value="Geburtsdatum" control="student-detail-textbox-geburtsdatum"/>
+      						<textbox id="student-detail-textbox-geburtsdatum" disabled="true" maxlength="10"/>
+      						<label value="Geburtsort" control="student-detail-textbox-geburtsort"/>
+      						<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
+      						<label value="Geburtszeit" control="student-detail-textbox-geburtszeit"/>
+      						<textbox id="student-detail-textbox-geburtszeit" disabled="true" maxlength="5"/>
+    					</row>
+    					<row>
+      						<label value="SVNR" control="student-detail-textbox-svnr"/>
+      						<textbox id="student-detail-textbox-svnr" disabled="true" maxlength="10"/>
+      						<label value="Ersatzkennzeichen" control="student-detail-textbox-ersatzkennzeichen"/>
+      						<textbox id="student-detail-textbox-ersatzkennzeichen" disabled="true" maxlength="10"/>
+    					</row>
+    					<row>
 							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
 							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
@@ -162,8 +106,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-						</row>
-						<row>
 							<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
 							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
@@ -176,8 +118,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-						</row>
-						<row>
 							<label value="Sprache" control="student-detail-menulist-sprache" />
 							<menulist id="student-detail-menulist-sprache" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/sprache.rdf.php" flex="1"
@@ -191,38 +131,95 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								</template>
 							</menulist>
 						</row>
-						<row>
-      						<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
-      						<textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15"/>
+    					<row>
+      						<label value="Geschlecht" control="student-detail-menulist-geschlecht"/>
+      						<menulist id="student-detail-menulist-geschlecht" disabled="true">
+								<menupopup>
+										<menuitem value="m" label="maennlich"/>
+										<menuitem value="w" label="weiblich"/>
+								</menupopup>								
+							</menulist>
+							<label value="Familienstand" control="student-detail-menulist-familienstand"/>
+      						<menulist id="student-detail-menulist-familienstand" disabled="true">
+								<menupopup>
+										<menuitem value="g" label="geschieden"/>
+										<menuitem value="l" label="ledig"/>
+										<menuitem value="v" label="verheiratet"/>
+										<menuitem value="w" label="verwittwet"/>
+								</menupopup>								
+							</menulist>
+							<label value="Anzahl der Kinder" control="student-detail-textbox-anzahlderkinder"/>
+      						<textbox id="student-detail-textbox-anzahlderkinder" disabled="true" maxlength="2"/>
     					</row>
     					<row>
-      						<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>
-      						<textbox id="student-detail-textbox-studiengang_kz" disabled="true" maxlength="4"/>
-    					</row>
-    					<row>
-      						<label value="Semester" control="student-detail-textbox-semester"/>
-      						<textbox id="student-detail-textbox-semester" disabled="true" maxlength="1"/>
-    					</row>
-    					<row>
-      						<label value="Verband" control="student-detail-textbox-verband"/>
-      						<textbox id="student-detail-textbox-verband" disabled="true" maxlength="1"/>
-    					</row>
-    					<row>
-      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
-      						<textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1"/>
+      						<vbox>
+      							<label value="Foto" />
+      							<hbox>
+      								<button id="student-detail-button-image-upload" label="Upload" oncommand="StudentImageUpload();" disabled="true"/>
+      								<spacer flex="1" />
+      							</hbox>
+      						</vbox>
+   							<hbox>
+   								<image src='' id="student-detail-image" width="60" height="60" style="margin-left:5px;"/>
+   								<spacer flex="1"/>
+   							</hbox>
+      						<label value="Anmerkung" control="student-detail-textbox-anmerkung"/>
+      						<textbox id="student-detail-textbox-anmerkung" disabled="true"/>
+      						<label value="Homepage" control="student-detail-textbox-homepage"/>
+      						<textbox id="student-detail-textbox-homepage" disabled="true" maxlength="256"/>
     					</row>
 				</rows>
 			</grid>
-		</hbox>
+			</groupbox>
+			<groupbox id="student-detail-groupbox-student">
+			<caption label="Student" />
+			<grid id="student-detail-grid-student" style="overflow:auto;margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+  					</columns>
+  					<rows>
+    					<row>
+    						<label value="Matrikelnummer" control="student-detail-textbox-matrikelnummer"/>
+      						<textbox id="student-detail-textbox-matrikelnummer" disabled="true" maxlength="15"/>
+      						<label value="Studiengang" control="student-detail-textbox-studiengang_kz"/>
+      						<menulist id="student-detail-menulist-studiengang_kz" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/studiengang.rdf.php" flex="1"
+						              ref="http://www.technikum-wien.at/studiengang/liste" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/studiengang/rdf#studiengang_kz"
+							        		      label="rdf:http://www.technikum-wien.at/studiengang/rdf#kuerzel - rdf:http://www.technikum-wien.at/studiengang/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+    					</row>
+    					<row>
+	    					<label value="Semester" control="student-detail-textbox-semester"/>
+      						<textbox id="student-detail-textbox-semester" disabled="true" maxlength="1"/>
+      						<label value="Verband" control="student-detail-textbox-verband"/>
+      						<textbox id="student-detail-textbox-verband" disabled="true" maxlength="1"/>
+      						<label value="Gruppe" control="student-detail-textbox-gruppe"/>
+      						<textbox id="student-detail-textbox-gruppe" disabled="true" maxlength="1"/>
+    					</row>
+    				</rows>
+    		</grid>
+    		</groupbox>
+    		<hbox>
+    			<spacer flex="1" />
+    			<button id="student-detail-button-save" label="Speichern" oncommand="StudentDetailSave();" disabled="true"/>
+    		</hbox>
+		</vbox>
 </vbox>
 
 <!-- STUDENT PREStudent -->
-<vbox id="student-prestudent" style="margin:0px;">
-		<hbox style="background:#eeeeee;margin:0px;padding:2px">
-			<label value="PreStudent" style="font-size:12pt;font-weight:bold;margin-top:5px;"  flex="1" />
-			<spacer flex="1" />
-			<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="false"/>
-		</hbox>
+<vbox id="student-prestudent" style="margin:0px;" flex="1">
+		
 		<vbox hidden="true">
 			<label value="Neu"/>
 			<checkbox id="student-prestudent-checkbox-new" checked="false" />      	
@@ -233,12 +230,16 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
       		<label value="studiengang_kz"/>
       		<textbox id="student-prestudent-textbox-studiengang_kz" disabled="true"/>
 		</vbox>
-		<hbox flex="1">
-			<grid id="student-prestudent-grid" style="overflow:auto;margin:4px;" flex="1">
+		<groupbox id="student-detail-groupbox-prestudent">
+		<caption label="Prestudent" />
+		<grid id="student-prestudent-grid-prestudent" style="overflow:auto;margin:4px;" flex="1">
 				  	<columns  >
     					<column flex="1"/>
     					<column flex="5"/>
-    					<column flex="3"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>    					
   					</columns>
   					<rows>
   						<row>
@@ -254,9 +255,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-    					</row>
-    					<row>
-      						<label value="Berufstaetigkeit" control="student-prestudent-menulist-berufstaetigkeit"/>
+							<label value="Berufstaetigkeit" control="student-prestudent-menulist-berufstaetigkeit"/>
       						<menulist id="student-prestudent-menulist-berufstaetigkeit" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/berufstaetigkeit.rdf.php?optional=true" flex="1"
 						              ref="http://www.technikum-wien.at/berufstaetigkeit/alle" >
@@ -268,9 +267,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-    					</row>
-						<row>
-      						<label value="Ausbildung" control="student-prestudent-menulist-ausbildung"/>
+							<label value="Ausbildung" control="student-prestudent-menulist-ausbildung"/>
       						<menulist id="student-prestudent-menulist-ausbildung" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/ausbildung.rdf.php?optional=true" flex="1"
 						              ref="http://www.technikum-wien.at/ausbildung/alle" >
@@ -283,6 +280,39 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								</template>
 							</menulist>
     					</row>
+    					<row>
+      						<label value="Aufnahmeschluessel" control="student-prestudent-menulist-aufnahmeschluessel"/>
+      						<menulist id="student-prestudent-menulist-aufnahmeschluessel" disabled="true"
+							          datasources="<?php echo APP_ROOT ?>rdf/aufnahmeschluessel.rdf.php?optional=true" flex="1"
+						              ref="http://www.technikum-wien.at/aufnahmeschluessel/alle" >
+								<template>
+									<menupopup>
+										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
+							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#bezeichnung"
+										  		  uri="rdf:*"/>
+										</menupopup>
+								</template>
+							</menulist>
+							<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf"/>
+      						<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
+      						<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
+      						<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
+    					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+   			<groupbox id="student-detail-groupbox-zgv">
+			<caption label="Zugangsvoraussetzung" />
+				<grid id="student-prestudent-grid-zgv" style="overflow:auto;margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>    					
+  					</columns>
+  					<rows>
     					<row>
       						<label value="ZGV" control="student-prestudent-menulist-zgvcode"/>
       						<menulist id="student-prestudent-menulist-zgvcode" disabled="true"
@@ -296,12 +326,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-    					</row>
-    					<row>
-      						<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
+							<label value="ZGV Ort" control="student-prestudent-textbox-zgvort"/>
       						<textbox id="student-prestudent-textbox-zgvort" disabled="true" maxlength="64"/>
-    					</row>
-    					<row>
       						<label value="ZGV Datum" control="student-prestudent-textbox-zgvdatum"/>
       						<textbox id="student-prestudent-textbox-zgvdatum" disabled="true" maxlength="10"/>
     					</row>
@@ -318,34 +344,32 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-    					</row>
-    					<row>
-      						<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
+							<label value="ZGV Master Ort" control="student-prestudent-textbox-zgvmasterort"/>
       						<textbox id="student-prestudent-textbox-zgvmasterort" disabled="true" maxlength="64"/>
-    					</row>
-    					<row>
       						<label value="ZGV Master Datum" control="student-prestudent-textbox-zgvmasterdatum"/>
       						<textbox id="student-prestudent-textbox-zgvmasterdatum" disabled="true" maxlength="10"/>
     					</row>
+    				</rows>
+    			</grid>
+    		</groupbox>
+    		<groupbox id="student-detail-groupbox-reihungstest">
+			<caption label="Reihungstest" />
+				<grid id="student-prestudent-grid-reihungstest" style="overflow:auto;margin:4px;" flex="1">
+				  	<columns  >
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>
+    					<column flex="1"/>
+    					<column flex="5"/>    					
+  					</columns>
+  					<rows>
     					<row>
-      						<label value="Aufnahmeschluessel" control="student-prestudent-menulist-aufnahmeschluessel"/>
-      						<menulist id="student-prestudent-menulist-aufnahmeschluessel" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/aufnahmeschluessel.rdf.php?optional=true" flex="1"
-						              ref="http://www.technikum-wien.at/aufnahmeschluessel/alle" >
-								<template>
-									<menupopup>
-										<menuitem value="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#aufnahmeschluessel"
-							        		      label="rdf:http://www.technikum-wien.at/aufnahmeschluessel/rdf#bezeichnung"
-										  		  uri="rdf:*"/>
-										</menupopup>
-								</template>
-							</menulist>
-    					</row>
-    					<row>
-      						<label value="Facheinschlaegig berufstaetig" control="student-prestudent-checkbox-facheinschlberuf"/>
-      						<checkbox id="student-prestudent-checkbox-facheinschlberuf" checked="true" disabled="true"/>
-    					</row>
-    					<row>
+    						<label value="Anmeldung zum Reihungstest am" control="student-prestudent-textbox-anmeldungreihungstest"/>
+      						<hbox>
+      							<textbox id="student-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10"/>
+      							<button id="student-prestudent-button-anmeldungreihungstest-heute" label="Heute" oncommand="StudentAnmeldungreihungstestHeute()" disabled="true"/>
+      						</hbox>
       						<label value="Reihungstest" control="student-prestudent-menulist-reihungstest"/>
       						<menulist id="student-prestudent-menulist-reihungstest" disabled="true"
 							          datasources="<?php echo APP_ROOT ?>rdf/reihungstest.rdf.php?optional=true" flex="1"
@@ -359,64 +383,58 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								</template>
 							</menulist>
     					</row>
-    					<row>
-      						<label value="Anmeldung zum Reihungstest am" control="student-prestudent-textbox-anmeldungreihungstest"/>
-      						<textbox id="student-prestudent-textbox-anmeldungreihungstest" disabled="true" maxlength="10"/>
-    					</row>
     					<row>
       						<label value="Zum Reihungstest angetreten" control="student-prestudent-checkbox-reihungstestangetreten"/>
       						<checkbox id="student-prestudent-checkbox-reihungstestangetreten" checked="true" disabled="true"/>
-    					</row>
-    					<row>
       						<label value="Reihungstestpunkte" control="student-prestudent-textbox-punkte"/>
       						<textbox id="student-prestudent-textbox-punkte" disabled="true" maxlength="19"/>
     					</row>
-    					<row>
-      						<label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
-      						<checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
-    					</row>
-    					<row>
-    						<label value="Rollen" control="student-prestudent-tree-rolle"/>
-    						<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
-									datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
-									style="margin:0px;" enableColumnDrag="true" height="100px"
-							>
-								<treecols>
-									<treecol id="student-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
-										class="sortDirectionIndicator"
-										sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
-									<splitter class="tree-splitter"/>
-									<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="5" hidden="false"
-									   class="sortDirectionIndicator"
-										sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-									<splitter class="tree-splitter"/>
-									<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="2" hidden="false"
-										class="sortDirectionIndicator"
-										sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" />
-									<splitter class="tree-splitter"/>
-									<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false"
-										class="sortDirectionIndicator"
-										sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />									
-									<splitter class="tree-splitter"/>
-								</treecols>
-					
-								<template>
-									<treechildren flex="1" >
-					   					<treeitem uri="rdf:*">
-											<treerow>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
-												<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
-											</treerow>
-										</treeitem>
-									</treechildren>
-								</template>
-							</tree>
-    					</row>
-				</rows>
-			</grid>
-		</hbox>
+    				</rows>
+    			</grid>
+    		</groupbox>
+    		<groupbox id="student-detail-groupbox-rollen">
+			<caption label="Rollen" />
+					<tree id="student-prestudent-tree-rolle" seltype="single" hidecolumnpicker="false" flex="1"
+							datasources="rdf:null" ref="http://www.technikum-wien.at/prestudentrolle/liste"
+							style="margin-left:10px;margin-right:10px;margin-bottom:5px;" height="100px" enableColumnDrag="true"
+					>
+						<treecols>
+							<treecol id="student-prestudent-tree-rolle-rolle_kurzbz" label="Kurzbz" flex="2" hidden="false" primary="true"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-studiensemester_kurzbz" label="StSem" flex="5" hidden="false"
+							   class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-ausbildungssemester" label="Semester" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester" />
+							<splitter class="tree-splitter"/>
+							<treecol id="student-prestudent-tree-rolle-datum" label="Datum" flex="2" hidden="false"
+								class="sortDirectionIndicator"
+								sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum" />									
+							<splitter class="tree-splitter"/>
+						</treecols>
+			
+						<template>
+							<treechildren flex="1" >
+			   					<treeitem uri="rdf:*">
+									<treerow>
+										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#rolle_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#studiensemester_kurzbz"/>
+										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#ausbildungssemester"/>
+										<treecell label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#datum"/>
+									</treerow>
+								</treeitem>
+							</treechildren>
+						</template>
+					</tree>
+			</groupbox>
+			<hbox>
+				<spacer flex="1" />
+				<button id="student-prestudent-button-save" label="Speichern" oncommand="StudentPrestudentSave();" disabled="true"/>
+			</hbox>
 </vbox>
 
 </overlay>
\ No newline at end of file
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index a60554420..509182524 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -43,7 +43,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
 			<!-- *************** -->
 			<!-- *  Studenten  * -->
 			<!-- *************** -->
-			<vbox id="studentenEditor">
+			<vbox id="studentenEditor" persist="height">
 				<hbox>
 					<toolbox flex="1">
 						<toolbar id="nav-toolbar">
@@ -65,7 +65,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
 						flags="dont-build-content"
 						enableColumnDrag="true"
 						style="margin:0px;"
-						persist="hidden"
+						persist="hidden, height"
 				>
 					<treecols>
 	    				<treecol id="student-treecol-uid" label="UID" flex="1" primary="false"
@@ -158,7 +158,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/studentdetailoverlay.xul.p
 				<!-- ************ -->
 				<!-- *  Detail  * -->
 				<!-- ************ -->
-				<vbox flex="1"  style="overflow:auto;margin:0px;">
+				<vbox flex="1"  style="overflow:auto;margin:0px;" persist="height">
 					<tabbox id="student-tabbox" flex="3" orient="vertical">
 						<tabs orient="horizontal" id="lehrveranstaltung-tabs">
 							<tab id="student-tab-detail" label="Details" />
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 381b3ec34..ab695d174 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -247,7 +247,7 @@ function StudentDetailDisableFields(val)
 	document.getElementById('student-detail-menulist-sprache').disabled=val;
 	document.getElementById('student-detail-textbox-matrikelnummer').disabled=val;
 	document.getElementById('student-detail-button-image-upload').disabled=val;
-	document.getElementById('student-detail-textbox-studiengang_kz').disabled=val;
+	document.getElementById('student-detail-menulist-studiengang_kz').disabled=val;
 	document.getElementById('student-detail-textbox-semester').disabled=val;
 	document.getElementById('student-detail-textbox-verband').disabled=val;
 	document.getElementById('student-detail-textbox-gruppe').disabled=val;
@@ -281,7 +281,7 @@ function StudentDetailSave()
 	geburtsnation = document.getElementById('student-detail-menulist-geburtsnation').value;
 	sprache = document.getElementById('student-detail-menulist-sprache').value;
 	matrikelnummer = document.getElementById('student-detail-textbox-matrikelnummer').value;
-	studiengang_kz = document.getElementById('student-detail-textbox-studiengang_kz').value;
+	studiengang_kz = document.getElementById('student-detail-menulist-studiengang_kz').value;
 	semester = document.getElementById('student-detail-textbox-semester').value;
 	verband = document.getElementById('student-detail-textbox-verband').value;
 	gruppe = document.getElementById('student-detail-textbox-gruppe').value;
@@ -481,7 +481,7 @@ function StudentAuswahl()
 	document.getElementById('student-detail-textbox-matrikelnummer').value=matrikelnummer;
 	document.getElementById('student-detail-image').src='<?php echo APP_ROOT?>content/bild.php?src=person&person_id='+person_id+'&'+gettimestamp();
 	document.getElementById('student-detail-textbox-person_id').value=person_id;
-	document.getElementById('student-detail-textbox-studiengang_kz').value=studiengang_kz;
+	document.getElementById('student-detail-menulist-studiengang_kz').value=studiengang_kz;
 	document.getElementById('student-detail-textbox-semester').value=semester;
 	document.getElementById('student-detail-textbox-verband').value=verband;
 	document.getElementById('student-detail-textbox-gruppe').value=gruppe;
@@ -589,6 +589,8 @@ function StudentPrestudentDisableFields(val)
 	document.getElementById('student-prestudent-checkbox-reihungstestangetreten').disabled=val;
 	document.getElementById('student-prestudent-textbox-punkte').disabled=val;
 	document.getElementById('student-prestudent-checkbox-bismelden').disabled=val;
+	document.getElementById('student-prestudent-button-anmeldungreihungstest-heute').disabled=val;
+	document.getElementById('student-prestudent-button-save').disabled=val;
 }
 
 // ****
@@ -667,4 +669,17 @@ function StudentPrestudentSave()
 		StudentTreeDatasource.Refresh(false); //non blocking
 		SetStatusBarText('Daten wurden gespeichert');
 	}
+}
+
+function StudentAnmeldungreihungstestHeute()
+{
+	var now = new Date();
+	var jahr = now.getFullYear();
+	
+	monat = now.getMonth();
+	if(monat<10) monat='0'+monat;
+	tag = now.getDate();
+	if(tag<10) tag='0'+tag;
+	
+	document.getElementById('student-prestudent-textbox-anmeldungreihungstest').value=jahr+'-'+monat+'-'+tag;
 }
\ No newline at end of file
diff --git a/rdf/index.html b/rdf/index.html
index fe802ae76..cb6327442 100644
--- a/rdf/index.html
+++ b/rdf/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html><head></head>
 
 <body>
@@ -113,6 +113,7 @@ Attribute:</span><br>
   <li>bezeichnung</li>
   <li>studiengang_kz</li>
   <li>semester</li>
+  <li>lehreverzeichnis</li>
   <li>unterrichtssprache</li>
   <li>ects</li>
   <li>semesterstunden</li>
diff --git a/rdf/lvinfo.rdf.php b/rdf/lvinfo.rdf.php
index d623d7b92..7c55ebdef 100644
--- a/rdf/lvinfo.rdf.php
+++ b/rdf/lvinfo.rdf.php
@@ -62,14 +62,16 @@ $qry = "SET CLIENT_ENCODING to 'UNICODE';
 SELECT 
 tbl_lehrveranstaltung.lehrveranstaltung_id as lv_lehrveranstaltung_id, 
 tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+tbl_lehrveranstaltung.lehreverzeichnis as lv_lehrevz,
 tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
 tbl_lehrveranstaltung.studiengang_kz as lv_studiengang_kz,
 tbl_lehrveranstaltung.semester as lv_semester,
 tbl_lehrveranstaltung.sprache as unterrichtssprache,
 tbl_lehrveranstaltung.ects as ects,
 tbl_lehrveranstaltung.semesterstunden as lv_semesterstunden,
+lower(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as stg_kuerzel,
 tbl_lvinfo.*
-FROM lehre.tbl_lehrveranstaltung JOIN campus.tbl_lvinfo USING(lehrveranstaltung_id) 
+FROM (lehre.tbl_lehrveranstaltung JOIN campus.tbl_lvinfo USING(lehrveranstaltung_id)) JOIN public.tbl_studiengang USING(studiengang_kz)
 WHERE 
 tbl_lehrveranstaltung.aktiv=true AND
 tbl_lehrveranstaltung.lehre=true AND
@@ -94,6 +96,7 @@ if($result = pg_query($conn, $qry))
 			<LVINFO:bezeichnung><![CDATA[<?php echo $row->lv_bezeichnung; ?>]]></LVINFO:bezeichnung>
 			<LVINFO:studiengang_kz><![CDATA[<?php echo $row->lv_studiengang_kz; ?>]]></LVINFO:studiengang_kz>
 			<LVINFO:semester><![CDATA[<?php echo $row->lv_semester; ?>]]></LVINFO:semester>
+			<LVINFO:lehreverzeichnis>cis.technikum-wien.at/documents/<?php echo $row->stg_kuerzel.'/'.$row->lv_semester.'/'.$row->lv_lehrevz;?></LVINFO:lehreverzeichnis>
 			<LVINFO:unterrichtssprache><![CDATA[<?php echo $row->unterrichtssprache; ?>]]></LVINFO:unterrichtssprache>
 			<LVINFO:ects><![CDATA[<?php echo $row->ects; ?>]]></LVINFO:ects>
 			<LVINFO:semesterstunden><![CDATA[<?php echo $row->lv_semesterstunden; ?>]]></LVINFO:semesterstunden>
diff --git a/rdf/studiengang.rdf.php b/rdf/studiengang.rdf.php
index d498ab26f..9e08eeb06 100644
--- a/rdf/studiengang.rdf.php
+++ b/rdf/studiengang.rdf.php
@@ -11,12 +11,12 @@ header("Cache-Control: post-check=0, pre-check=0",false);
 header("Expires Mon, 26 Jul 1997 05:00:00 GMT");
 header("Pragma: no-cache");
 // content type setzen
-header("Content-type: application/vnd.mozilla.xul+xml");
+header("Content-type: application/xhtml+xml");
 // xml
 echo '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>';
 // DAO
-include('../vilesci/config.inc.php');
-include_once('../include/studiengang.class.php');
+require_once('../vilesci/config.inc.php');
+require_once('../include/studiengang.class.php');
 
 // Datenbank Verbindung
 if (!$conn = @pg_pconnect(CONN_STRING))
@@ -24,9 +24,9 @@ if (!$conn = @pg_pconnect(CONN_STRING))
 
 // raumtypen holen
 $studiengangDAO=new studiengang($conn);
-$studiengaenge=$studiengangDAO->getAll();
+$studiengangDAO->getAll('typ, kurzbz');
 
-$rdf_url='http://www.technikum-wien.at/tempus/studiengang';
+$rdf_url='http://www.technikum-wien.at/studiengang';
 
 ?>
 
@@ -38,10 +38,8 @@ $rdf_url='http://www.technikum-wien.at/tempus/studiengang';
   <RDF:Seq about="<?php echo $rdf_url ?>/liste">
 
 <?php
-if (is_array($studiengaenge)) {
-
-	foreach ($studiengaenge as $sg)
-	{
+foreach ($studiengangDAO->result as $sg)
+{
 	?>
   <RDF:li>
       	<RDF:Description  id="<?php echo $sg->studiengang_kz; ?>"  about="<?php echo $rdf_url.'/'.$sg->studiengang_kz; ?>" >
@@ -53,11 +51,10 @@ if (is_array($studiengaenge)) {
 			<STUDIENGANG:typ><?php echo $sg->typ  ?></STUDIENGANG:typ>
 			<STUDIENGANG:farbe><?php echo $sg->farbe  ?></STUDIENGANG:farbe>
 			<STUDIENGANG:email><?php echo $sg->email  ?></STUDIENGANG:email>
+			<STUDIENGANG:kuerzel><?php echo $sg->kuerzel  ?></STUDIENGANG:kuerzel>
       	</RDF:Description>
   </RDF:li>
 	  <?php
-	}
-
 }
 ?>