diff --git a/public/css/markdown.css b/public/css/markdown.css
index a810fa3ce..9f4024ba8 100644
--- a/public/css/markdown.css
+++ b/public/css/markdown.css
@@ -175,6 +175,10 @@
   margin-bottom: 0;
 }
 
+.markdown img {
+  max-width: 100%;
+}
+
 .markdown .btn {
   color: #fff;
 }
diff --git a/public/img/404.png b/public/img/404.png
new file mode 100644
index 000000000..1f0ee0ef4
Binary files /dev/null and b/public/img/404.png differ
diff --git a/public/img/500.png b/public/img/500.png
new file mode 100644
index 000000000..2c122fde9
Binary files /dev/null and b/public/img/500.png differ
diff --git a/public/js/app.js b/public/js/app.js
index df755727b..e0f92854f 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -98,7 +98,7 @@ var Gogits = {
     };
     // fix dropdown inside click
     Gogits.initDropDown = function(){
-        $('.dropdown-menu').on('click','a,button,input,select',function(e){
+        $('.dropdown-menu.no-propagation').on('click',function(e){
             e.stopPropagation();
         });
     };
diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl
index cf1b7d038..4d939e250 100644
--- a/templates/repo/nav.tmpl
+++ b/templates/repo/nav.tmpl
@@ -18,7 +18,7 @@
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                         <span class="caret"></span>
                     </button>
-                    <div class="dropdown-menu clone-group-btn dropdown-menu-right">
+                    <div class="dropdown-menu clone-group-btn dropdown-menu-right no-propagation">
                         <div class="input-group">
                             <span class="input-group-btn">
                                 <button class="btn btn-default" data-link="{{.CloneLink.SSH}}" type="button">SSH</button>
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 4e836b228..c2cafe0c9 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,7 +1,8 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
-    <h4>This page is not found !</h4>
+<div id="gogs-body" class="container text-center">
+    <p style="margin-top: 80px"><img src="/img/404.png" alt="404"/></p>
+    <hr/>
     <p>Application Version: {{AppVer}}</p>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index 9a00eb1ff..f3cd24d69 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -1,7 +1,10 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container text-center">
+    <p style="margin-top: 80px"><img src="/img/500.png" alt="404"/></p>
+    <hr/>
     <p>An error is occurred : {{.ErrorMsg}}</p>
+    <hr/>
     <p>Application Version: {{AppVer}}</p>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file