diff --git a/group/templates/group/groups_right_panel.html b/group/templates/group/groups_right_panel.html
index 5df7ee7c3a..c049959ad8 100644
--- a/group/templates/group/groups_right_panel.html
+++ b/group/templates/group/groups_right_panel.html
@@ -26,9 +26,10 @@
   <p>{% blocktrans %}You can create a group by clicking "New Group" button. Group is a place for you and your friends leaving messages and collaborating on libraries.{% endblocktrans %}</p>
 </div>
 {% endif %}
-<form id="group-add-form" action="" method="post" name="group-add-form" class="hide">
+<form id="group-add-form" action="" method="post" name="group-add-form" class="simple-input-popup hide">
+    <h3>{% trans "New Group" %}</h3>
     <label>{% trans "Group Name" %}</label><br />
-    <input id="group_name" name="group_name" value="" /><br />
+    <input id="group_name" name="group_name" value="" class="long-input" /><br />
     <p class="error hide"></p>
-    <input id="group-add-submit" type="submit" value="{% trans "Submit" %}" />
+    <input id="group-add-submit" type="submit" class="submit" value="{% trans "Submit" %}" />
 </form>
diff --git a/media/css/seahub.css b/media/css/seahub.css
index b7ed382d82..429bff23e8 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -556,12 +556,19 @@ textarea:-moz-placeholder {/* for FF */
 .simplemodal-close {
     margin-left:5px;
 }
-#confirm-popup {
+#confirm-popup,
+#rename-form {
     min-width:255px;
 }
 #confirm-popup button {
     margin-top:.8em;
 }
+.simple-input-popup {
+    width:255px;
+}
+.simple-input-popup .long-input {
+    width:99%;
+}
 
 /*ui-autocomplete*/
 .ui-autocomplete {
diff --git a/templates/repo.html b/templates/repo.html
index f337381db1..bc7bcaa0f6 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -159,21 +159,23 @@
         </div>
     </div>
 
-    <form id="add-new-dir-form" action="" method="post" class="hide">{% csrf_token %}
-        <h4>{% trans "Directory Name"%}</h4>
+    <form id="add-new-dir-form" action="" method="post" class="simple-input-popup hide">{% csrf_token %}
+        <h3>{% trans "New Directory" %}</h3>
+        <label>{% trans "Directory Name" %}</label>
         <input type="hidden" name="repo_id" value="{{ repo.id }}" />
         <input type="hidden" name="parent_dir" value="{{ path }}" />
-        <input type="text" name="new_dir_name" value="" /><br />
+        <input type="text" name="new_dir_name" value="" class="long-input" /><br />
         <p class="error hide"></p>
         <input type="submit" value="{% trans "Submit" %}" class="submit" />
         <button class="simplemodal-close">{% trans "Cancel" %}</button>
     </form>
 
-    <form id="add-new-file-form" action="" method="post" class="hide">{% csrf_token %}
-        <h4>{% trans "File Name"%}</h4>
+    <form id="add-new-file-form" action="" method="post" class="simple-input-popup hide">{% csrf_token %}
+        <h3>{% trans "New File" %}</h3>
+        <label>{% trans "File Name" %}</label>
         <input type="hidden" name="repo_id" value="{{ repo.id }}" />
         <input type="hidden" name="parent_dir" value="{{ path }}" />
-        <input type="text" name="new_file_name" value="" /><br />
+        <input type="text" name="new_file_name" value="" class="long-input" /><br />
         <p class="error hide"></p>
         <input type="submit" value="{% trans "Submit"%}" class="submit" />
         <button class="simplemodal-close">{% trans "Cancel"%}</button>