diff --git a/media/css/seahub.css b/media/css/seahub.css
index 05c651d43c..faa342c6f1 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -134,7 +134,6 @@ table img {
 .main {
     width:680px;
 }
-#footer { color:#999; padding-top:2px; margin:25px auto; border-top:1px solid #DDD; }
 
 /* info-bar */
 #info-bar { height: 30px; color: #fff; background: #000; }
@@ -175,7 +174,36 @@ table img {
 #header .nav a.cur { color:#000; }
 #header .nav a:hover { color: #ff9933; text-decoration: underline; }
 /* footer */
-#footer a { color:#333; text-decoration:none; }
+#footer { 
+    color:#636363;
+    font-size:12px;
+    padding:20px 0 10px;
+    margin:25px auto;
+    border-top:1px solid #DDD;
+}
+#footer .items {
+    width:65%;
+}
+#footer .other-info {
+    width:30%;
+}
+#footer .item {
+    float:left;
+    width:28%;
+    padding:0 3% 0 2%;
+}
+#footer .item h4 {
+    font-size:12px;
+    font-weight:bold;
+    color:#636363;
+    padding-bottom:5px;
+    border-bottom:1px solid #e1e1e1;
+    margin-bottom:5px;
+}
+#footer a {
+    color:#444;
+    font-weight:normal;
+}
 /* main */
 .path, .access-notice { margin: 12px 0 6px 0; }
 .with-bg li {
@@ -349,24 +377,24 @@ table img {
     margin-top:12px;
 }
 .repo-op a {
+    font-weight: normal;
     margin-left:8px;
     background:#fff scroll no-repeat left 50%;
 }
 .repo-op .upload-file {
     padding-left:17px;
     background-image:url('../img/upload.png');
-    font-weight: normal;
 }
 #add-new-dir {
     padding-left:20px;
     background-image:url('../img/folder-add.png');
-    font-weight: normal;
 }
 .more-op {
     cursor:pointer;
 }
 .op-list {
     position:absolute;
+    left:18px;
     background:#fff;
     padding:6px 1px;
     border:1px solid #eee;
diff --git a/templates/base.html b/templates/base.html
index 8b44c6af0e..bfc4682442 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -77,7 +77,7 @@
         <div id="right-panel">
             {% block right_panel %}{% endblock %}
         </div>
-        <div id="main-panel" class="clear w100">
+        <div id="main-panel" class="clear w100 ovhd">
             {% block main_panel %}{% endblock %}
         </div>
         <div id="dialog-confirm" class="hide">
@@ -88,14 +88,39 @@
     </div>
 
     <div id="footer" class="ovhd">
-        <p class="fleft">Copyright © 2012 海文互知. 服务器版本：{{ seafile_version }}</p>
-        <p class="fright">Contact | About</p>
+        <div class="items fleft">
+            <div class="item">
+                <h4>SeaCloud</h4>
+                <ul>
+                    <li>About</li>
+                    <li><a href="http://wiki.seafile.com.cn/" target="_blank">Wiki</a></li>
+                    <li><a href="http://gonggeng.org/vanilla/" target="_blank">论坛</a></li>
+                    <li>Contact</li>
+                </ul>
+            </div>
+            <div class="item">
+                <h4>客户端</h4>
+                <ul>
+                    <li><a href="http://www.seafile.com/download/">Seafile for Windows</a></li>
+                </ul>
+            </div>
+            <div class="item">
+                <h4>文档</h4>
+                <ul>
+                    <li><a href="http://www.seafile.com/help/" target="_blank">使用帮助</a></li>
+                </ul>
+            </div>
+        </div>
+        <div class="other-info fright">
+            <p>服务器版本：{{ seafile_version }}</p>
+            <p>© 2012 海文互知.</p>
+        </div>
     </div>
 
 </div><!-- wrapper -->
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.min.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.simplemodal.1.4.1.min.js"></script>
-<script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script>
+<!--script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.cookie.js"></script-->
 <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-ui-1.8.16.custom.min.js"></script>
 <script type="text/javascript" src="{{ MEDIA_URL }}js/utils.js"></script>
 {% block extra_script %}{% endblock %}
diff --git a/templates/myhome_base.html b/templates/myhome_base.html
index cea286471a..52a482b1b9 100644
--- a/templates/myhome_base.html
+++ b/templates/myhome_base.html
@@ -22,20 +22,5 @@
     <li>
         <a href="{{ SITE_ROOT}}back/local/">回到本地</a>
     </li>
-    
-    <li>
-        <a href="http://www.gonggeng.org/seasite/help/" target="_blank">使用帮助</a>
-    </li>
-    <!--
-    <li>
-        <a href="{{ SITE_ROOT }}repos/my/">Files</a>
-    </li>
-    <li>
-        <a href="{{ SITE_ROOT }}peers/">Peers</a>
-    </li>
-    <li>
-        <a href="{{ SITE_ROOT }}groups/">Groups</a>
-    </li>
-    -->
 </ul>
 {% endblock %}
diff --git a/templates/repo.html b/templates/repo.html
index 5dd2678ac7..da089dcf92 100644
--- a/templates/repo.html
+++ b/templates/repo.html
@@ -126,13 +126,15 @@
               <td></td>
               <td>
                 {% if not view_history %}
-                  <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
-                  <ul class="op-list hide">
-                      <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
-                      <li><a class="op dir-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
-                      <li><a class="op dir-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
-                      <li><a class="op dir-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
-                  </ul>
+                  <div>
+                      <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
+                      <ul class="op-list hide">
+                          <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
+                          <li><a class="op dir-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
+                          <li><a class="op dir-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
+                          <li><a class="op dir-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
+                      </ul>
+                  </div>
                 {% endif %}
               </td>
             </tr>
@@ -144,16 +146,18 @@
               <td><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/view/{{ dirent.props.obj_id }}/?commit_id={{ current_commit.id }}&file_name={{ dirent.props.obj_name }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}&history={{ view_history }}">{{ dirent.props.obj_name }}</a></td>
               <td>{{ dirent.file_size|filesizeformat }}</td>
               <td>
-                  <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
-                  <ul class="op-list hide">
-                      <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">下载</a></li>
-                      {% if not view_history %}
-                      <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
-                      <li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
-                      <li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
-                      <li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
-                      {% endif %}
-                  </ul>
+                  <div>
+                      <img src="{{ MEDIA_URL }}img/more-option.png" alt="更多操作" class="more-op hide" />
+                      <ul class="op-list hide">
+                          <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?file_name={{ dirent.props.obj_name }}&op=download">下载</a></li>
+                          {% if not view_history %}
+                          <li><a class="op" href="{{ SITE_ROOT }}repo/{{ repo.props.id }}/{{ dirent.props.obj_id }}/?p={{ path|urlencode }}&file_name={{ dirent.props.obj_name|urlencode }}&op=del">删除</a></li>
+                          <li><a class="op file-rename" href="#" data="{{ dirent.obj_name }}">重命名</a></li>
+                          <li><a class="op file-mv" href="#" data="{{ dirent.obj_name }}">移动</a></li>
+                          <li><a class="op file-cp" href="#" data="{{ dirent.obj_name }}">复制</a></li>
+                          {% endif %}
+                      </ul>
+                  </div>
               </td>
             </tr>
             {% endfor %}
@@ -222,8 +226,10 @@ $('.more-op').hover(
     function() {
         $(this).parent().css('position','relative');
         $('.op-list').attr('class', 'op-list hide');
-        if ($(this).offset().top + $(this).next().height() > $('#main').offset().top + $('#main').height()) {
-            $(this).next().css('bottom', 25);
+        if ($(this).offset().top + $(this).next().height() <= $('#main-panel').offset().top + $('#main-panel').height()) {
+            $(this).next().css('top', 6);
+        } else {
+            $(this).next().css('bottom', 2);
         }
         $(this).next().removeClass('hide');
         clearTimeout(Hide);
@@ -335,7 +341,7 @@ $('.file-cp, .file-mv, .dir-cp, .dir-mv').click(function () {
                             path.shift();
                             path = '/' + path.join('/') + '/';
                         }
-                        return '{{ SITE_ROOT }}file/move/get_subdir/?repo_id=' + encodeURIComponent(repo_id) + '&path=' + encodeURIComponent(path);    
+                        return '{{ SITE_ROOT }}file/move/get_subdir/?repo_id=' + e(repo_id) + '&path=' + e(path);
                     }
                 }
             },