diff --git a/dist/treebird20.css b/dist/treebird20.css
index 041dcff..b0d0940 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -49,8 +49,8 @@ ul
     width: 1000px;
     margin-left: auto;
     margin-right: auto;
-    box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.2);
-    border-width: 0;
+    box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(200, 200, 200, 0.7);
     border-radius: 5px;
 }
 
@@ -1531,17 +1531,31 @@ ul.large-list
 
 ul.large-list li
 {
+    display: block;
     list-style-type: none;
     margin: 0;
 }
 
 ul.large-list li a
 {
-    display: block;
+    display: inline-block;
     padding: 15px;
     list-style-type: none;
 }
 
+ul.large-list li a.list-item
+{
+    width: 406px;
+}
+
+ul.large-list li a.edit-list-btn
+{
+    border-left: 1px solid #eaeaea;
+    background: linear-gradient(#f8f8fc, #efeff2);
+    color: #505050;
+    width: 33px;
+}
+
 .lists-view-header
 {
     text-align: center;
@@ -1558,6 +1572,24 @@ ul.large-list li a
     border-bottom: 1px solid #dadada;
 }
 
+.create-list-form
+{
+    width: 380px;
+    margin: 0;
+    padding: 8px;
+    border: 0;
+}
+
+.create-list-btn
+{
+    width: 104px;
+    border-top: none !important;
+    border-bottom: none !important;
+    border-right: none !important;
+    padding-top: 8px !important;
+    padding-bottom: 8px !important;
+}
+
 /* Navigation */
 .navigation,
 .tabs
diff --git a/static/list.tmpl b/static/list.tmpl
index 54517b2..8deb6d6 100644
--- a/static/list.tmpl
+++ b/static/list.tmpl
@@ -1 +1,3 @@
-  <li><a href="{{%s:prefix}}/lists/for/{{%s:list_id}}" class="btn split">{{%s:list}}</a></li>
+<li>
+  <a href="{{%s:prefix}}/lists/for/{{%s:list_id}}" class="btn split list-item">{{%s:list}}</a><a href="{{%s:prefix}}/lists/edit/{{%s:list_id}}" class="btn edit-list-btn">Edit</a>
+</li>
diff --git a/static/lists.tmpl b/static/lists.tmpl
index 482f23b..4febce0 100644
--- a/static/lists.tmpl
+++ b/static/lists.tmpl
@@ -6,8 +6,12 @@
       {{%s:lists}}
     </ul>
 
-    <ul class="large-list center">
-      <li><a href="{{%s:prefix}}/lists/create" class="btn split center-text bold-text">Create new list</a></li>
+    <ul class="large-list center create-list">
+      <form action="{{%s:prefix}}/lists/create" method="post">
+        <li>
+          <input type="text" class="create-list-form"><input type="submit" value="Create list" class="create-list-btn btn">
+        </li>
+      </form>
     </ul>
   </div>
 </div>