diff --git a/mod/group.php b/mod/group.php
index 538277a0c6..57e879206a 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -49,7 +49,9 @@ function group_content(&$a) {
 
 	}
 		
-dbg(2);
+
+
+
 	if(($a->argc == 2) && (intval($a->argv[1]))) {
 		require_once('view/acl_selectors.php');
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -60,14 +62,21 @@ dbg(2);
 			notice("Group not found." . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 		}
-		$ret = group_get_members($r[0]['id']);
+		$group = $r[0];
+		$ret = group_get_members($group['id']);
 		$preselected = array();
 		if(count($ret))	{
 			foreach($ret as $p)
 				$preselected[] = $p['id'];
 		}
-		$sel = contact_select('group_members_select','group_members_select',$preselected);
-	$o .= $sel;	
+
+		$tpl = file_get_contents('view/group_edit.tpl');
+		$o .= replace_macros($tpl, array(
+			'$gid' => $group['id'],
+			'$name' => $group['name'],
+			'$selector' => contact_select('group_members_select','group_members_select',$preselected,25)
+		));
+
 	}
 
 
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index e5df4c65ed..e3ee8c8792 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -1,11 +1,11 @@
 <?php
 
 
-function group_select($selname,$selclass,$preselected = false) {
+function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o = '';
 
-	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"4\" />\r\n";
+	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
 
 	$r = q("SELECT * FROM `group` WHERE `uid` = %d ORDER BY `name` ASC",
 		$_SESSION['uid']
@@ -30,11 +30,11 @@ function group_select($selname,$selclass,$preselected = false) {
 
 
 
-function contact_select($selname,$selclass,$preselected = false) {
+function contact_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o = '';
 
-	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"4\" />\r\n";
+	$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
 
 	$r = q("SELECT `id`, `name` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ORDER BY `name` ASC ",
 		$_SESSION['uid']
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
new file mode 100644
index 0000000000..ebe32f4725
--- /dev/null
+++ b/view/group_edit.tpl
@@ -0,0 +1,18 @@
+<h2>Group Editor</h2>
+
+
+<div id="group-edit-wrapper" >
+<form action="group/$gid" id="group-edit-form" method="post" >
+<div id="group-editname-wrapper" >
+<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label>
+<input type="text" name="groupname" value="$name" />
+</div>
+<div id="group-edit-name-end"></div>
+<div id="group-edit-select-wrapper" >
+<label id=group_members_select_label"  for="group_members_select" >Members:</label>
+$selector
+
+</div>
+<div id="group-edit-select-end" ></div>
+</form>
+</div>
diff --git a/view/style.css b/view/style.css
index a031731c54..cd10102d48 100644
--- a/view/style.css
+++ b/view/style.css
@@ -831,4 +831,8 @@ input#dfrn-url {
 
 #acl-wrapper-end {
 	clear: both;
+}
+
+.group_members_select {
+	width: 200px;
 }
\ No newline at end of file