diff --git a/admin/addgroup.apnl.php b/admin/addgroup.apnl.php
index 546f282..b6de49d 100644
--- a/admin/addgroup.apnl.php
+++ b/admin/addgroup.apnl.php
@@ -65,7 +65,7 @@ class addgroup_panel extends admin_module{
                                 <th><strong>Rechte</strong></th>
                             </tr>";
                 while ($row = $db->fetch_array($result)){
-                    $panel->content.="<tr><td><strong>".$row["text"].":</strong><br />".$this->get_option($row["type"],$row["id"])."</td></tr>";
+                    $panel->content.="<tr><td><strong>".$row["text"].":</strong><br />".$panel->get_option($row["type"],$row["id"])."</td></tr>";
                 }
                 $panel->content.="</table><br />";
                 $panel->field(array("name"=>"send","typ"=>"hidden","value"=>"1"));
@@ -75,78 +75,5 @@ class addgroup_panel extends admin_module{
 			}
 	}
 
-	function get_option($option,$name) {
-		global $config,$db,$panel,$userinfo,$admin,$root,$firephp;
- 		
-		if($option=="yesno"){
-			$checked["yes"]="";
-			$checked["no"]="";
-			$yn=$panel->radio(array("name"=>$name,"value"=>"1"),NULL,TRUE);
-			$yn.="Ja";
-			$yn.=$panel->radio(array("name"=>$name,"value"=>"0"),NULL,TRUE);
-			$yn.="Nein";
-			return $yn;
-		}
-		if($option=="onoff"){
-			$checked["on"]="";
-			$checked["off"]="";
-			$yn=$panel->radio(array("name"=>$name,"value"=>"1"),NULL,TRUE);
-			$yn.="An";
-			$yn.=$panel->radio(array("name"=>$name,"value"=>"0"),NULL,TRUE);
-			$yn.="Aus";
-			return $yn;
-		}
-
-		if($option=="text"){
-			$text=$panel->field(array("name"=>$name,"typ"=>"text"),"",TRUE);
-			return $text;
-		}
-
-		if(strstr($option,"wysiwyg")){
-			$string=str_replace("wysiwyg(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$a_name[]=$substr[0];
-				$value[]=$substr[1];
-			}
-			if(is_array($sarr)){
-				$text=$panel->textarea(array("name"=>$name, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"class=\"mceEditor\"",TRUE);
-			}else{
-				$text=$panel->textarea(array("name"=>$name),"class=\"mceEditor\"",TRUE);
-			}
-			return $text;
-		}
-
-		if(strstr($option,"textarea")){
-			$string=str_replace("textarea(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$a_name[]=$substr[0];
-				$value[]=$substr[1];
-			}
-			if(is_array($sarr)){
-				$text=$panel->textarea(array("name"=>$name, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"",TRUE);
-			}else{
-				$text=$panel->textarea(array("name"=>$name),"",TRUE);
-			}
-			return $text;
-		}
-
-		if(strstr($option,"select")){
-			//$text=$panel->field("text",$name,"value=\"".$config[$name]."\"",TRUE);
-			$string=str_replace("select(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$values[$substr[0]]=$substr[1];
-			}
-			$select=$panel->select($values,NULL,$name,"",TRUE);
-			return $select;
-		}
-		
-	}
-	
 }
 ?>
\ No newline at end of file
diff --git a/admin/editgroup.apnl.php b/admin/editgroup.apnl.php
index 4e068dd..0f12700 100644
--- a/admin/editgroup.apnl.php
+++ b/admin/editgroup.apnl.php
@@ -72,7 +72,7 @@ class editgroup_panel extends admin_module{
 						if(empty($rval["value"])){
 							$rval["value"] = 0;
 						}
-						$panel->content.="<tr><td><strong>".$row["text"].":</strong><br />".$this->get_option($row["type"],$row["id"],$rval["value"])."</td></tr>";
+						$panel->content.="<tr><td><strong>".$row["text"].":</strong><br />".$panel->get_option($row["type"],$row["id"],$rval["value"])."</td></tr>";
 					}
 					$panel->content.="</table><br />";
 					$panel->field(array("name"=>"send","typ"=>"hidden","value"=>"1"));
@@ -125,89 +125,7 @@ class editgroup_panel extends admin_module{
 		}
 	}
 
-	function get_option($option,$name,$value) {
-		global $config,$db,$panel,$userinfo,$admin,$root,$firephp;
- 		
-		if($option=="yesno"){
-			$checked["yes"]="";
-			$checked["no"]="";
-			if($value==1||$value==True||$value=="yes"){
-				$checked["yes"]='checked="checked"';
-			}else{
-				$checked["no"]='checked="checked"';
-			}
-			$yn=$panel->radio(array("name"=>$name,"value"=>"1"),$checked["yes"],TRUE);
-			$yn.="Ja";
-			$yn.=$panel->radio(array("name"=>$name,"value"=>"0"),$checked["no"],TRUE);
-			$yn.="Nein";
-			return $yn;
-		}
-		if($option=="onoff"){
-			$checked["on"]="";
-			$checked["off"]="";
-			if($value==1||$value==True||$value=="on"){
-				$checked["on"]='checked="checked"';
-			}else{
-				$checked["off"]='checked="checked"';
-			}
-			$yn=$panel->radio(array("name"=>$name,"value"=>"1"),$checked["on"],TRUE);
-			$yn.="An";
-			$yn.=$panel->radio(array("name"=>$name,"value"=>"0"),$checked["off"],TRUE);
-			$yn.="Aus";
-			return $yn;
-		}
 
-		if($option=="text"){
-			$text=$panel->field(array("name"=>$name,"typ"=>"text","value"=>$value),"",TRUE);
-			return $text;
-		}
-
-		if(strstr($option,"wysiwyg")){
-			$string=str_replace("wysiwyg(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$a_name[]=$substr[0];
-				$value[]=$substr[1];
-			}
-			if(is_array($sarr)){
-				$text=$panel->textarea(array("name"=>$name,"value"=>$value, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"class=\"mceEditor\"",TRUE);
-			}else{
-				$text=$panel->textarea(array("name"=>$name,"value"=>$value),"class=\"mceEditor\"",TRUE);
-			}
-			return $text;
-		}
-
-		if(strstr($option,"textarea")){
-			$string=str_replace("textarea(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$a_name[]=$substr[0];
-				$value[]=$substr[1];
-			}
-			if(is_array($sarr)){
-				$text=$panel->textarea(array("name"=>$name,"value"=>$value, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"",TRUE);
-			}else{
-				$text=$panel->textarea(array("name"=>$name,"value"=>$value),"",TRUE);
-			}
-			return $text;
-		}
-
-		if(strstr($option,"select")){
-			//$text=$panel->field("text",$name,"value=\"".$config[$name]."\"",TRUE);
-			$string=str_replace("select(","",substr($option, 0, -1));
-			$sarr=explode(";",$string);
-			foreach($sarr as $str){
-				$substr=explode("|",$str);
-				$values[$substr[0]]=$substr[1];
-			}
-			$select=$panel->select($values,$value,$name,"",TRUE);
-			return $select;
-		}
-		
-	}
-	
 	function meta() {
 			global $module,$config,$db,$panel,$userinfo,$admin,$root;
 			$meta='<script type="text/javascript" src="'.$config["path"].'/js/scriptaculous/prototype.js"></script>
diff --git a/inc/panel.class.php b/inc/panel.class.php
index a91f72e..bc965aa 100644
--- a/inc/panel.class.php
+++ b/inc/panel.class.php
@@ -132,6 +132,7 @@ class panel {
 			return $form;
 		}
 	}
+
 	function formClose ($return=FALSE)
 	{
 
@@ -212,6 +213,88 @@ class panel {
 		}
 	}
 
+	function get_option($option,$name,$value) {
+
+		if($option=="yesno"){
+			$checked["yes"]="";
+			$checked["no"]="";
+			if($value==1||$value==True||$value=="yes"){
+				$checked["yes"]='checked="checked"';
+			}else{
+				$checked["no"]='checked="checked"';
+			}
+			$yn=$this->radio(array("name"=>$name,"value"=>"1"),$checked["yes"],TRUE);
+			$yn.="Ja";
+			$yn.=$this->radio(array("name"=>$name,"value"=>"0"),$checked["no"],TRUE);
+			$yn.="Nein";
+			return $yn;
+		}
+		if($option=="onoff"){
+			$checked["on"]="";
+			$checked["off"]="";
+			if($value==1||$value==True||$value=="on"){
+				$checked["on"]='checked="checked"';
+			}else{
+				$checked["off"]='checked="checked"';
+			}
+			$yn=$this->radio(array("name"=>$name,"value"=>"1"),$checked["on"],TRUE);
+			$yn.="An";
+			$yn.=$this->radio(array("name"=>$name,"value"=>"0"),$checked["off"],TRUE);
+			$yn.="Aus";
+			return $yn;
+		}
+
+		if($option=="text"){
+			$text=$this->field(array("name"=>$name,"typ"=>"text","value"=>$value),"",TRUE);
+			return $text;
+		}
+
+		if(strstr($option,"wysiwyg")){
+			$string=str_replace("wysiwyg(","",substr($option, 0, -1));
+			$sarr=explode(";",$string);
+			foreach($sarr as $str){
+				$substr=explode("|",$str);
+				$a_name[]=$substr[0];
+				$value[]=$substr[1];
+			}
+			if(is_array($sarr)){
+				$text=$this->textarea(array("name"=>$name,"value"=>$value, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"class=\"mceEditor\"",TRUE);
+			}else{
+				$text=$this->textarea(array("name"=>$name,"value"=>$value),"class=\"mceEditor\"",TRUE);
+			}
+			return $text;
+		}
+
+		if(strstr($option,"textarea")){
+			$string=str_replace("textarea(","",substr($option, 0, -1));
+			$sarr=explode(";",$string);
+			foreach($sarr as $str){
+				$substr=explode("|",$str);
+				$a_name[]=$substr[0];
+				$value[]=$substr[1];
+			}
+			if(is_array($sarr)){
+				$text=$this->textarea(array("name"=>$name,"value"=>$value, $a_name[0]=>$value[0],$a_name[1]=>$value[1]),"",TRUE);
+			}else{
+				$text=$this->textarea(array("name"=>$name,"value"=>$value),"",TRUE);
+			}
+			return $text;
+		}
+
+		if(strstr($option,"select")){
+			//$text=$panel->field("text",$name,"value=\"".$config[$name]."\"",TRUE);
+			$string=str_replace("select(","",substr($option, 0, -1));
+			$sarr=explode(";",$string);
+			foreach($sarr as $str){
+				$substr=explode("|",$str);
+				$values[$substr[0]]=$substr[1];
+			}
+			$select=$this->select($values,$value,$name,"",TRUE);
+			return $select;
+		}
+
+	}
+
 	/*
 		$args[value] used for default text (as in "field" function)
 	*/