diff --git a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
index 1ac5650..29ed94c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc
@@ -27,77 +27,32 @@
 // gets the delete stuff
 function getPage() {
     global $default;
-    $oSystem = new System;
-
-    global $default;
-
-    $aRowNames = array ("LDAP Server: ",
-                        "LDAP Root DN: ",
-                        "LDAP Server Type (iPlanet OR ActiveDirectory): ",
-                        "Email Server:",
-                        "Administrator Email Address: ",
-                        "Administrator Name: ",
-                        "Default Email Address: ",
-                        "Default Email Name: ",
-                        "Document Root: ",
-                        "Language Directory: ",
-                        "User Interface Directory: ",
-                        "Root URL: ",
-                        "Graphics URL: ",
-                        "User Interface URL: ",
-                        "Default Language: ",
-                        "Session Timeout: ");
-
-    $aNames = array("fldapServer",
-                    "fldapRootDn",
-                    "fldapServerType",
-                    "femailServer",
-                    "femailAdmin",
-                    "femailAdminName",
-                    "femailFrom",
-                    "femailFromName",
-                    "fdocumentRoot",
-                    "flanguageDirectory",
-                    "fuiDirectory",
-                    "frootUrl",
-                    "fgraphicsUrl",
-                    "fuiUrl",
-                    "fdefaultLanguage",
-                    "fsessionTimeout");
-
-    $aValue = $aNames;
-    // todo
-
-    // create a for loop that'll print out the names and input field with the value in
-    // use the system table to get the value into the text field, by passing it the name
-    // then loop a database entry to add everything...
-    // and then when submit...run a set thingy..
+    $oSystem = $default->system;
 
     $sToRender .= renderHeading("System Settings");
     $sToRender .= "<table>\n";
-    $sToRender .= "<tr><b>Current System Settings: </b></tr>\n";
     $sToRender .= "<tr>\n";
     $sToRender .= "<tr>\n";
     $sToRender .= "</tr>\n";
-    for($i = 0; $i < count($aNames); $i++) {
-        if ($oSystem->initialised()) {
-            $sToRender .= "<td>". ($i+1) .".</td><td>" .$aRowNames[$i] ." </td><td><input size = \"40\" type=\"text\" name=\"". $aNames[$i] ."\" value =\"". $oSystem->get(substr($aNames[$i],1)) ."\"></td>\n";
-        } else {
-            $sSetting = substr($aNames[$i],1);
-            $sToRender .= "<td>". ($i+1) .".</td><td>" .$aRowNames[$i] ." </td><td><input size = \"40\" type=\"text\" name=\"". $aNames[$i] ."\" value =\"". $default->$sSetting ."\"></td>\n";
+    for($i = 0; $i < count($oSystem->aSettings); $i++) {
+    	if ($oSystem->initialised()) {
+    		$sValue = $oSystem->get($oSystem->aSettings[$i]);
+    	} else {
+    		$tmp = $oSystem->aSettings[$i];
+    		$sValue = $default->$tmp;
+    	}
+    	if (is_array($sValue)) {
+        	$sValue = implode(";", $sValue);
         }
-        $sToRender .= "</tr>\n";
-
+        $sToRender .= "<tr><td>". ($i+1) .".</td><td>" . $oSystem->aLabels[$i] ." </td><td><input size=\"40\" type=\"text\" name=\"" . $oSystem->aSettings[$i] . "\" value =\"$sValue\"></td></tr>\n";
     }
-    //$oSystem->generateRequiredFieldValidation($aNames,$aRowNames);
+
     // do some validation
     $sToRender .= "\n\n<script language=\"javascript\">\n<!--\n";
     $sToRender .= "function validateForm(theForm) {\n";
-
-    for ($i = 0; $i < count($aNames); $i++) {
-        $sToRender .= "\tif (!(validRequired(document.MainForm." .$aNames[$i] . ", '" . $aRowNames[$i] . "'))) {\n";
+    for ($i = 0; $i < count($oSystem->aSettings); $i++) {
+        $sToRender .= "\tif (!(validRequired(document.MainForm." . $oSystem->aSettings[$i] . ", '" . $oSystem->aLabels[$i] . "'))) {\n";
         $sToRender .= "\t\treturn false;\n\t}\n";
-
     }
     $sToRender .= "return true;\n}\n";
     $sToRender .= "//-->\n</script>\n\n";
@@ -110,21 +65,4 @@ function getPage() {
 
     return $sToRender;
 }
-
-// if edition is successful print otu success page
-function getPageSuccess() {
-    global $default;
-
-    $sToRender .= renderHeading("System Settings");
-    $sToRender .= "<table>\n";
-    $sToRender .= "<tr><td><b>Success!</b></td></tr>\n";
-    $sToRender .= "<tr><td>The Settings were successfully modified</td></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr></tr>\n";
-    $sToRender .= "<tr>\n";
-    $sToRender .= "<td></td><td align = right><a href=\"$default->rootUrl/control.php?action=systemAdministration\"><img src =\"$default->graphicsUrl/widgets/back.gif\" border = \"0\" /></a></td>\n";
-    $sToRender .= "</tr>\n";
-    $sToRender .= "</table>\n";
-    return $sToRender;
-}
 ?>
\ No newline at end of file