diff --git a/pinry/core/static/core/js/pinry.js b/pinry/core/static/core/js/pinry.js
index 0d899c1..6f46836 100644
--- a/pinry/core/static/core/js/pinry.js
+++ b/pinry/core/static/core/js/pinry.js
@@ -41,13 +41,22 @@ function loadData(tag) {
 
     if (tag !== undefined) {
         globalTag = tag;
+        window.history.pushState(tag, 'Pinry - Tag - '+tag, '/pins/tag/'+tag+'/');
+    } else if (url(2) == 'tag') {
+        tag = url(3);
+        globalTag = tag;
+        window.history.pushState(tag, 'Pinry - Tag - '+tag, '/pins/tag/'+tag+'/');
     }
 
-    if (tag !== undefined && page != 0) {
+    if (tag !== undefined) {
         $('#pins').html('');
         page = 0;
-        if (tag != null) $('.tags').html('<span class="label tag" onclick="loadData(null)">' + tag + ' x</span>');
-        else $('.tags').html('');
+        if (tag != null)
+            $('.tags').html('<span class="label tag" onclick="loadData(null)">' + tag + ' x</span>');
+        else {
+            $('.tags').html('');
+            window.history.pushState(tag, 'Pinry - Recent Pins', '/pins/');
+        }
     }
 
     var loadURL = apiURL+(page*30);
diff --git a/pinry/core/templates/core/base.html b/pinry/core/templates/core/base.html
index 6380ffb..bf1dca9 100644
--- a/pinry/core/templates/core/base.html
+++ b/pinry/core/templates/core/base.html
@@ -52,10 +52,10 @@
             <script src="/static/vendor/wookmark/0.5/jquery.wookmark.js"></script>
             <script src="/static/vendor/fancybox/2.0.6/jquery.fancybox.js"></script>
             <script src="/static/vendor/imagesloaded/2.0.1/jquery.imagesloaded.js"></script>
+            <script src="/static/vendor/js-url/1.7.2/js-url.js"></script>
 
             <script src="/static/core/js/pinry.js"></script>
             <script src="/static/core/js/messages.js"></script>
         {% endcompress %}
-
     </body>
 </html>
diff --git a/pinry/pins/urls.py b/pinry/pins/urls.py
index 9864a71..bae91be 100644
--- a/pinry/pins/urls.py
+++ b/pinry/pins/urls.py
@@ -3,6 +3,7 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns('pinry.pins.views',
     url(r'^$', 'recent_pins', name='recent-pins'),
+    url(r'^tag/.+/$', 'recent_pins', name='tag'),
     url(r'^new-pin/$', 'new_pin', name='new-pin'),
-    url(r'^delete-pin/(?P<pin_id>\d*)/$', 'delete_pin', name='delete-pin'),
+    url(r'^delete-pin/(?P<pin_id>\d+)/$', 'delete_pin', name='delete-pin'),
 )
diff --git a/pinry/vendor/static/vendor/js-url/1.7.2/js-url.js b/pinry/vendor/static/vendor/js-url/1.7.2/js-url.js
new file mode 100644
index 0000000..9511849
--- /dev/null
+++ b/pinry/vendor/static/vendor/js-url/1.7.2/js-url.js
@@ -0,0 +1,78 @@
+/******************************************
+ * Websanova.com
+ *
+ * Resources for web entrepreneurs
+ *
+ * @author          Websanova
+ * @copyright       Copyright (c) 2012 Websanova.
+ * @license         This websanova JavaScript url is dual licensed under the MIT and GPL licenses.
+ * @link            http://www.websanova.com
+ * @github          http://github.com/websanova/js-url
+ * @version			1.7.2
+ *
+ ******************************************/
+
+window.url = (function() {
+	function isNumeric(arg) {
+	  return !isNaN(parseFloat(arg)) && isFinite(arg);
+	}
+	
+	return function url(arg, url) {
+		var _ls = url || window.location.toString();
+
+		if(_ls.substring(0,2) === '//') _ls = 'http:' + _ls;
+		else if(_ls.split('://').length === 1) _ls = 'http://' + _ls;
+
+		url = _ls.split('/');
+		var _l = {auth:''}, host = url[2].split('@');
+
+		if(host.length === 1) host = host[0].split(':');
+		else{ _l.auth = host[0]; host = host[1].split(':'); }
+
+		_l.protocol=url[0], _l.hostname=host[0], _l.port=(host[1]||'80'), _l.pathname='/' + url.slice(3, url.length).join('/').split('?')[0].split('#')[0];
+		var _p = _l.pathname;
+		if(_p.split('.').length === 1 && _p[_p.length-1] !== '/') _p += '/';
+		var _h = _l.hostname, _hs = _h.split('.'), _ps = _p.split('/');
+
+		if(!arg) return _ls;
+		else if(arg === 'hostname') return _h;
+		else if(arg === 'domain') return _hs.slice(-2).join('.');
+		else if(arg === 'tld') return _hs.slice(-1).join('.');
+		else if(arg === 'sub') return _hs.slice(0, _hs.length - 2).join('.');
+		else if(arg === 'port') return _l.port || '80';
+		else if(arg === 'protocol') return _l.protocol.split(':')[0];
+		else if(arg === 'auth') return _l.auth;
+		else if(arg === 'user') return _l.auth.split(':')[0];
+		else if(arg === 'pass') return _l.auth.split(':')[1] || '';
+		else if(arg === 'path') return _p;
+		else if(arg[0] === '.')
+		{
+			arg = arg.substring(1);
+			if(isNumeric(arg)) {arg = parseInt(arg); return _hs[arg < 0 ? _hs.length + arg : arg-1] || ''; }
+		}
+		else if(isNumeric(arg)){ arg = parseInt(arg); return _ps[arg < 0 ? _ps.length - 1 + arg : arg] || ''; }
+		else if(arg === 'file') return _ps.slice(-1)[0];
+		else if(arg === 'filename') return _ps.slice(-1)[0].split('.')[0];
+		else if(arg === 'fileext') return _ps.slice(-1)[0].split('.')[1] || '';
+		else if(arg[0] === '?' || arg[0] === '#')
+		{
+			var params = _ls, param = null;
+
+			if(arg[0] === '?') params = (params.split('?')[1] || '').split('#')[0];
+			else if(arg[0] === '#') params = (params.split('#')[1] || '');
+
+			if(!arg[1]) return params;
+
+			arg = arg.substring(1);
+			params = params.split('&');
+
+			for(var i=0,ii=params.length; i<ii; i++)
+			{
+				param = params[i].split('=');
+				if(param[0] === arg) return param[1];
+			}
+		}
+
+		return '';
+	}
+})();
diff --git a/pinry/vendor/static/vendor/js-url/1.7.2/js-url.min.js b/pinry/vendor/static/vendor/js-url/1.7.2/js-url.min.js
new file mode 100644
index 0000000..c19862b
--- /dev/null
+++ b/pinry/vendor/static/vendor/js-url/1.7.2/js-url.min.js
@@ -0,0 +1 @@
+/* url() v1.7.2 - http://github.com/websanova/js-url */window.url=(function(){function b(c){return !isNaN(parseFloat(c))&&isFinite(c)}return function a(p,d){var c=d||window.location.toString();if(c.substring(0,2)==="//"){c="http:"+c}else{if(c.split("://").length===1){c="http://"+c}}d=c.split("/");var g={auth:""},o=d[2].split("@");if(o.length===1){o=o[0].split(":")}else{g.auth=o[0];o=o[1].split(":")}g.protocol=d[0],g.hostname=o[0],g.port=(o[1]||"80"),g.pathname="/"+d.slice(3,d.length).join("/").split("?")[0].split("#")[0];var e=g.pathname;if(e.split(".").length===1&&e[e.length-1]!=="/"){e+="/"}var k=g.hostname,l=k.split("."),m=e.split("/");if(!p){return c}else{if(p==="hostname"){return k}else{if(p==="domain"){return l.slice(-2).join(".")}else{if(p==="tld"){return l.slice(-1).join(".")}else{if(p==="sub"){return l.slice(0,l.length-2).join(".")}else{if(p==="port"){return g.port||"80"}else{if(p==="protocol"){return g.protocol.split(":")[0]}else{if(p==="auth"){return g.auth}else{if(p==="user"){return g.auth.split(":")[0]}else{if(p==="pass"){return g.auth.split(":")[1]||""}else{if(p==="path"){return e}else{if(p[0]==="."){p=p.substring(1);if(b(p)){p=parseInt(p);return l[p<0?l.length+p:p-1]||""}}else{if(b(p)){p=parseInt(p);return m[p<0?m.length-1+p:p]||""}else{if(p==="file"){return m.slice(-1)[0]}else{if(p==="filename"){return m.slice(-1)[0].split(".")[0]}else{if(p==="fileext"){return m.slice(-1)[0].split(".")[1]||""}else{if(p[0]==="?"||p[0]==="#"){var h=c,f=null;if(p[0]==="?"){h=(h.split("?")[1]||"").split("#")[0]}else{if(p[0]==="#"){h=(h.split("#")[1]||"")}}if(!p[1]){return h}p=p.substring(1);h=h.split("&");for(var j=0,n=h.length;j<n;j++){f=h[j].split("=");if(f[0]===p){return f[1]}}}}}}}}}}}}}}}}}}}return""}})();
\ No newline at end of file