diff --git a/src/main/scala/app/AccountController.scala b/src/main/scala/app/AccountController.scala
index 7ee24aa..4cd9785 100644
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -182,7 +182,7 @@
   }
 
   get("/groups/new")(usersOnly {
-    html.group(None, List((context.loginAccount.get.userName, true)))
+    account.html.group(None, List((context.loginAccount.get.userName, true)))
   })
 
   post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -198,7 +198,7 @@
 
   get("/:groupName/_editgroup")(managersOnly {
     defining(params("groupName")){ groupName =>
-      html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+      account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
     }
   })
 
diff --git a/src/main/twirl/account/group.scala.html b/src/main/twirl/account/group.scala.html
new file mode 100644
index 0000000..b4b46dd
--- /dev/null
+++ b/src/main/twirl/account/group.scala.html
@@ -0,0 +1,139 @@
+@(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(if(account.isEmpty) "Create group" else "Edit group"){
+<div>
+  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
+      <div class="row-fluid">
+        <div class="span5">
+          <fieldset>
+            <label for="groupName" class="strong">Group name</label>
+            <div>
+              <span id="error-groupName" class="error"></span>
+            </div>
+            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+          </fieldset>
+          <fieldset>
+            <label class="strong">URL (Optional)</label>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
+            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+          </fieldset>
+          <fieldset>
+            <label for="avatar" class="strong">Image (Optional)</label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+        <div class="span7">
+          <fieldset>
+            <label class="strong">Members</label>
+            <ul id="member-list" class="collaborator">
+            </ul>
+            @helper.html.account("memberName", 200)
+            <input type="button" class="btn" value="Add" id="addMember"/>
+            <input type="hidden" id="members" name="members" value="@members.map(x => x._1 + ":" + x._2).mkString(",")"/>
+            <div>
+              <span class="error" id="error-members"></span>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
+        @if(account.isDefined){
+          <div class="pull-right">
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+          </div>
+        }
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        @if(account.isDefined){
+          <a href="@url(account.get.userName)" class="btn">Cancel</a>
+        }
+      </fieldset>
+  </form>
+</div>
+}
+<script>
+$(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
+  $('#addMember').click(function(){
+    $('#error-memberName').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#member-list li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-memberName').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@path/admin/users/_usercheck', {
+      'userName': userName
+    }, function(data, status){
+      if(data == 'true'){
+        addMemberHTML(userName, false);
+      } else {
+        $('#error-memberName').text('User does not exist.');
+      }
+    });
+  });
+
+  $(document).on('click', '.remove', function(){
+    $(this).parent().remove();
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    return !(e.keyCode == 13);
+  });
+
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
+  @members.map { case (userName, isManager) =>
+    addMemberHTML('@userName', @isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').addClass('is_manager_' + userName);
+    if(!isManager){
+      memberButton.addClass('active');
+    }
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').addClass('is_manager_' + userName);
+    if(isManager){
+      memberButton.addClass('active');
+    }
+
+    $('#member-list').append($('<li>')
+      .data('name', userName)
+      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('.is_manager_' + userName + '.active').attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+    return true;
+  }
+});
+</script>
\ No newline at end of file
diff --git a/src/main/twirl/group.scala.html b/src/main/twirl/group.scala.html
deleted file mode 100644
index c6c5427..0000000
--- a/src/main/twirl/group.scala.html
+++ /dev/null
@@ -1,139 +0,0 @@
-@(account: Option[model.Account], members: List[(String, Boolean)])(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@main(if(account.isEmpty) "Create group" else "Edit group"){
-<div>
-  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
-      <div class="row-fluid">
-        <div class="span5">
-          <fieldset>
-            <label for="groupName" class="strong">Group name</label>
-            <div>
-              <span id="error-groupName" class="error"></span>
-            </div>
-            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
-          </fieldset>
-          <fieldset>
-            <label class="strong">URL (Optional)</label>
-            <div>
-              <span id="error-url" class="error"></span>
-            </div>
-            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
-          </fieldset>
-          <fieldset>
-            <label for="avatar" class="strong">Image (Optional)</label>
-            @helper.html.uploadavatar(account)
-          </fieldset>
-        </div>
-        <div class="span7">
-          <fieldset>
-            <label class="strong">Members</label>
-            <ul id="member-list" class="collaborator">
-            </ul>
-            @helper.html.account("memberName", 200)
-            <input type="button" class="btn" value="Add" id="addMember"/>
-            <input type="hidden" id="members" name="members" value="@members.map(x => x._1 + ":" + x._2).mkString(",")"/>
-            <div>
-              <span class="error" id="error-members"></span>
-            </div>
-          </fieldset>
-        </div>
-      </div>
-      <fieldset class="margin">
-        @if(account.isDefined){
-          <div class="pull-right">
-            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
-          </div>
-        }
-        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
-        @if(account.isDefined){
-          <a href="@url(account.get.userName)" class="btn">Cancel</a>
-        }
-      </fieldset>
-  </form>
-</div>
-}
-<script>
-$(function(){
-  $('input[type=submit]').click(function(){
-    updateMembers();
-  });
-
-  $('#addMember').click(function(){
-    $('#error-memberName').text('');
-    var userName = $('#memberName').val();
-
-    // check empty
-    if($.trim(userName) == ''){
-      return false;
-    }
-
-    // check duplication
-    var exists = $('#member-list li').filter(function(){
-      return $(this).data('name') == userName;
-    }).length > 0;
-    if(exists){
-      $('#error-memberName').text('User has been already added.');
-      return false;
-    }
-
-    // check existence
-    $.post('@path/admin/users/_usercheck', {
-      'userName': userName
-    }, function(data, status){
-      if(data == 'true'){
-        addMemberHTML(userName, false);
-      } else {
-        $('#error-memberName').text('User does not exist.');
-      }
-    });
-  });
-
-  $(document).on('click', '.remove', function(){
-    $(this).parent().remove();
-  });
-
-  // Don't submit form by ENTER key
-  $('#memberName').keypress(function(e){
-    return !(e.keyCode == 13);
-  });
-
-  $('#delete').click(function(){
-    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
-  });
-
-  @members.map { case (userName, isManager) =>
-    addMemberHTML('@userName', @isManager);
-  }
-
-  function addMemberHTML(userName, isManager){
-    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').addClass('is_manager_' + userName);
-    if(!isManager){
-      memberButton.addClass('active');
-    }
-    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').addClass('is_manager_' + userName);
-    if(isManager){
-      memberButton.addClass('active');
-    }
-
-    $('#member-list').append($('<li>')
-      .data('name', userName)
-      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
-        .append(memberButton)
-        .append(managerButton))
-      .append(' ')
-      .append($('<a>').attr('href', '@path/' + userName).text(userName))
-      .append(' ')
-      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
-  }
-
-  function updateMembers(){
-    var members = $('#member-list li').map(function(i, e){
-      var userName = $(e).data('name');
-      return userName + ':' + $('.is_manager_' + userName + '.active').attr('value');
-    }).get().join(',');
-    $('#members').val(members);
-    return true;
-  }
-});
-</script>
\ No newline at end of file