diff --git a/modules/setting/setting_memcache.go b/modules/setting/setting_memcache.go
index e509f372d3..26b1cc6f60 100644
--- a/modules/setting/setting_memcache.go
+++ b/modules/setting/setting_memcache.go
@@ -7,7 +7,7 @@
 package setting
 
 import (
-	_ "github.com/gogits/cache/memcache"
+	_ "github.com/macaron-contrib/cache/memcache"
 )
 
 func init() {
diff --git a/modules/setting/setting_redis.go b/modules/setting/setting_redis.go
index 78b31d534f..bfd1694de3 100644
--- a/modules/setting/setting_redis.go
+++ b/modules/setting/setting_redis.go
@@ -7,8 +7,8 @@
 package setting
 
 import (
-	_ "github.com/gogits/cache/redis"
-	_ "github.com/gogits/session/redis"
+	_ "github.com/macaron-contrib/cache/redis"
+	_ "github.com/macaron-contrib/session/redis"
 )
 
 func init() {
diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index d81d6f3149..6ff68a5b28 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1,6 +1,7 @@
 html,
 body {
   height: 100%;
+  overflow-y: scroll;
 }
 .octicon,
 .fa {
diff --git a/public/ng/less/gogs/base.less b/public/ng/less/gogs/base.less
index 241846dbbd..8a88450747 100644
--- a/public/ng/less/gogs/base.less
+++ b/public/ng/less/gogs/base.less
@@ -11,6 +11,7 @@
 html,
 body {
     height: 100%;
+    overflow-y: scroll;
 }
 .octicon,
 .fa {