diff --git a/app/surf.rb b/app/surf.rb
index d8813359..7be15690 100644
--- a/app/surf.rb
+++ b/app/surf.rb
@@ -44,9 +44,13 @@ get %r{\/surf\/proxy\/([\w-]+)\/(.+)|\/surf\/proxy\/([\w-]+)\/?} do
 
         new_ele = nil
 
-        if uri.match /^\//
-          new_ele = ele.gsub(uri, "#{$config['surf_proxy_uri']}/surf/proxy/#{site.username}#{uri}")
-        elsif !uri.match /^\w+:\/\//
+        if uri.match(/^\w+:\/\/|^\/\//i)
+          if ele.match(/^href/i)
+            new_ele = ele + ' target="_blank"'
+          else
+            new_ele = ele
+          end
+        else
           new_ele = ele.gsub(uri, "#{$config['surf_proxy_uri']}/surf/proxy/#{site.username}/#{uri}")
         end
 
diff --git a/views/surf.erb b/views/surf.erb
index ff0316b7..5c532b2c 100644
--- a/views/surf.erb
+++ b/views/surf.erb
@@ -15,7 +15,7 @@
       padding: 0;
     }
     html {
-      height: 100%; 
+      height: 100%;
     }
     body {
       height: 100%;
@@ -50,7 +50,7 @@
     }
     #top-bar li {
       float: left;
-      margin-left: 20px;  
+      margin-left: 20px;
       line-height: normal;
     }
     #top-bar a {
@@ -143,7 +143,7 @@
     #followLink .following {
       display: none;
     }
-    #followLink .unfollow { 
+    #followLink .unfollow {
       display: none;
     }
     #followLink.is-following {
@@ -153,19 +153,19 @@
     #followLink.is-following .follow {
       display: none;
     }
-    #followLink.is-following .following { 
+    #followLink.is-following .following {
       display: inline;
     }
-    #followLink.is-following .unfollow { 
+    #followLink.is-following .unfollow {
       display: none;
     }
     #followLink.is-following.unfollow .follow {
       display: none;
     }
-    #followLink.is-following.unfollow .following { 
+    #followLink.is-following.unfollow .following {
       display: none;
     }
-    #followLink.is-following.unfollow .unfollow { 
+    #followLink.is-following.unfollow .unfollow {
       display: inline;
     }
     </style>
@@ -235,9 +235,9 @@
         <a class="close" href="//<%= @site.host %>" alt="close" title="close"></a>
       </li>
     </ul>
-  
+
   </div>
-  <iframe src="//<%= @site.host %>" frameborder="0" scrolling="yes" marginheight="0" marginwidth="0" id="website-frame" name="website-frame"></iframe>
+  <iframe src="<%= "#{$config['surf_proxy_uri']}/surf/proxy/#{@site.username}" %>" frameborder="0" scrolling="yes" marginheight="0" marginwidth="0" id="website-frame" name="website-frame"></iframe>
 
   <script src="/js/jquery-1.11.0.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
@@ -267,7 +267,7 @@
     })
 
     var link = $('a#followLink');
-    
+
     function toggleFollow(id) {
       $.post('/site/'+id+'/toggle_follow', {csrf_token: '<%= csrf_token %>'}, function(res) {
         if(res.result == 'followed')
@@ -287,4 +287,4 @@
     });
   </script>
   </body>
-</html>
\ No newline at end of file
+</html>