diff --git a/404.php b/404.php
index 449ae05..0de3c48 100644
--- a/404.php
+++ b/404.php
@@ -5,14 +5,21 @@
  */
 
 get_header();
-?>
+?><div id="header3">
+    <a href="http://opencounter.org">
+    <canvas id="clockcanvas" width="50" height="50"></canvas>
+</a>
+    
+        
+    
+</div>
 
 	<div id="content" class="narrowcolumn">
 
-		<h2 class="center"><?php _e('Error 404 - Not Found', 'kubrick'); ?></h2>
-
+		<p class="b"><?php _e('Wipe Out 404', 'kubrick'); ?></p>
+<p class="s">Maybe try searching for it, dude:<?php get_search_form(); ?></p> 
 	</div>
 
-<?php get_sidebar(); ?>
+
 
 <?php get_footer(); ?>
diff --git a/home.php b/home.php
index b7ada93..a7c4156 100644
--- a/home.php
+++ b/home.php
@@ -8,7 +8,7 @@
 
 get_header(); ?>
 <script type="text/javascript" src="http://opencounter.org/wp-content/themes/opencounter/scripts/jquery-1.3.min.js"></script>
-<script type="text/javascript" src="http://opencounter.org/wp-content/themes/opencounter/scripts/thinbox.js"></script>
+<script type="text/javascript" src="http://opencounter.org/wp-content/themes/opencounter/scripts/thinbox2.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
 	ThinBox.open("betawindow.html",{'width':'500px','height':'400px'});
diff --git a/map.php b/map.php
index d03cc5a..9823e22 100644
--- a/map.php
+++ b/map.php
@@ -96,7 +96,7 @@ function executeQuery(address){
 wax.tilejson('http://a.tiles.mapbox.com/v3/tamaracfa.map-lhp1bb4f.jsonp',
 	function(tilejson) {
 		_tilejson = tilejson;
-		map = new L.Map('map-div', { scrollWheelZoom: false })
+		map = new L.Map('map-div', { scrollWheelZoom: false, maxZoom: 17 })
     		.addLayer(new wax.leaf.connector(tilejson))
     		.setView(new L.LatLng(36.9749, -122.0263), 13);
 
diff --git a/scripts/cookies.min.js b/scripts/cookies.min.js
new file mode 100644
index 0000000..95aa370
--- /dev/null
+++ b/scripts/cookies.min.js
@@ -0,0 +1,4 @@
+/*! Cookies.js - 0.1.3; Copyright (c) 2012, Scott Hamper; http://www.opensource.org/licenses/MIT */
+(function(e,f){var c=function(){var a=Array.prototype.slice.call(arguments);return 1===a.length?c.get(a[0]):a[1]===f?c.expire(a[0],a[2]):c.set(a[0],a[1],a[2])};c.get=function(a){e.cookie!==c._cacheString&&c._populateCache();return c._cache[a]};c.defaults={path:"/"};c.set=function(a,d,b){b={path:b&&b.path||c.defaults.path,domain:b&&b.domain||c.defaults.domain,expires:b&&b.expires||c.defaults.expires,secure:b&&b.secure||c.defaults.secure};switch(typeof b.expires){case "number":b.expires=new Date((new Date).getTime()+
+1E3*b.expires);break;case "string":b.expires=new Date(b.expires)}a=encodeURIComponent(a)+"="+encodeURIComponent(JSON.stringify(d));a+=b.path?";path="+b.path:"";a+=b.domain?";domain="+b.domain:"";a+=b.expires?";expires="+b.expires.toGMTString():"";a+=b.secure?";secure":"";e.cookie=a;return c};c.expire=function(a,d){return c.set(a,"",{path:d&&d.path,domain:d&&d.domain,expires:-1})};c._populateCache=function(){c._cache={};c._cacheString=e.cookie;for(var a=c._cacheString.split(";"),d=0;d<a.length;d++){var b=
+"function"===typeof String.prototype.trim?a[d].trim().split("="):a[d].replace(/^\s+|\s+$/g,"").split("="),g=decodeURIComponent(b[0]),b=decodeURIComponent(b[1]);if(c._cache[g]===f){try{b=JSON.parse(b)}catch(h){}c._cache[g]=b}}};c.enabled=function(){var a=1===c.set("cookies.js",1).get("cookies.js");c.expire("cookies.js");return a}();"function"===typeof define&&define.amd?define(function(){return c}):window.Cookies=c})(document);
\ No newline at end of file
diff --git a/scripts/json3.min.js b/scripts/json3.min.js
new file mode 100644
index 0000000..44744cd
--- /dev/null
+++ b/scripts/json3.min.js
@@ -0,0 +1,19 @@
+/*! JSON v3.2.1 | http://bestiejs.github.com/json3 | Copyright 2012, Kit Cambridge | http://kit.mit-license.org */
+;(function(){function j(l){throw l;}var m=void 0,p=!0,w=null,x=!1;
+(function(){var l={}.toString,n,C,o="function"===typeof define&&define.c,c="object"==typeof exports&&exports,D='{"result":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}',F,q,E,B,i="function"==typeof c.parse,G,H,u,v,f=new Date(-3509827334573292),r,I,y;try{f=-109252==f.getUTCFullYear()&&0===f.getUTCMonth()&&1==f.getUTCDate()&&10==f.getUTCHours()&&37==f.getUTCMinutes()&&6==f.getUTCSeconds()&&708==f.getUTCMilliseconds()}catch(J){}f||(r=Math.floor,I=[0,31,59,90,120,151,181,212,243,273,304,334],y=function(b,
+e){return I[e]+365*(b-1970)+r((b-1969+(e=+(1<e)))/4)-r((b-1901+e)/100)+r((b-1601+e)/400)});o||c?(o&&define("json",c={}),"object"==typeof JSON&&JSON&&(c.stringify=JSON.stringify,c.parse=JSON.parse)):c=this.JSON||(this.JSON={});if(o="function"==typeof c.stringify&&!y){f=function(){return 1};f.toJSON=f;try{switch(x){case "0"===c.stringify(0):case "0"===c.stringify(new (0).constructor):case '""'==c.stringify(new "".constructor):case c.stringify(l)===m:case c.stringify(m)===m:case c.stringify()===m:case "1"===
+c.stringify(f):case "[1]"==c.stringify([f]):case "[null]"==c.stringify([m]):case "null"==c.stringify(w):case "[null,null,null]"==c.stringify([m,l,w]):case c.stringify({result:[f,p,x,w,"\x00\u0008\n\u000c\r\t"]})==D:case "1"===c.stringify(w,f):case "[\n 1,\n 2\n]"==c.stringify([1,2],w,1):case '"-271821-04-20T00:00:00.000Z"'==c.stringify(new Date(-864E13)):case '"+275760-09-13T00:00:00.000Z"'==c.stringify(new Date(864E13)):case '"-000001-01-01T00:00:00.000Z"'==c.stringify(new Date(-621987552E5)):case '"1969-12-31T23:59:59.999Z"'==
+c.stringify(new Date(-1)):o=x}}catch(K){o=x}}if(i)try{if(0===c.parse("0")&&!c.parse(x)&&(f=c.parse(D),i=5==f.result.length&&1==f.result[0])){try{i=!c.parse('"\t"')}catch(L){}if(i)try{i=1!=c.parse("+1")&&1!=c.parse("01")}catch(M){}}}catch(N){i=x}f=D=w;if(!o||!i){if(!(n={}.hasOwnProperty))n=function(b){var e={},a;if((e.__proto__=w,e.__proto__={toString:1},e).toString!=l)n=function(a){var b=this.__proto__,a=a in(this.__proto__=w,this);this.__proto__=b;return a};else{a=e.constructor;n=function(b){var e=
+(this.constructor||a).prototype;return b in this&&!(b in e&&this[b]===e[b])}}e=w;return n.call(this,b)};C=function(b,e){var a=0,d,c,h;(d=function(){this.valueOf=0}).prototype.valueOf=0;c=new d;for(h in c)n.call(c,h)&&a++;d=c=w;if(a)a=a==2?function(a,b){var e={},d=l.call(a)=="[object Function]",c;for(c in a)!(d&&c=="prototype")&&!n.call(e,c)&&(e[c]=1)&&n.call(a,c)&&b(c)}:function(a,b){var e=l.call(a)=="[object Function]",c,d;for(c in a)!(e&&c=="prototype")&&n.call(a,c)&&!(d=c==="constructor")&&b(c);
+(d||n.call(a,c="constructor"))&&b(c)};else{c=["valueOf","toString","toLocaleString","propertyIsEnumerable","isPrototypeOf","hasOwnProperty","constructor"];a=function(a,b){var e=l.call(a)=="[object Function]",d;for(d in a)!(e&&d=="prototype")&&n.call(a,d)&&b(d);for(e=c.length;d=c[--e];n.call(a,d)&&b(d));}}a(b,e)};o||(F={"\\":"\\\\",'"':'\\"',"\u0008":"\\b","\u000c":"\\f","\n":"\\n","\r":"\\r","\t":"\\t"},q=function(b,e){return("000000"+(e||0)).slice(-b)},E=function(b){for(var e='"',a=0,d;d=b.charAt(a);a++)e=
+e+('\\"\u0008\u000c\n\r\t'.indexOf(d)>-1?F[d]:d<" "?"\\u00"+q(2,d.charCodeAt(0).toString(16)):d);return e+'"'},B=function(b,e,a,d,c,h,f){var g=e[b],k,s,t,i,o,u,v,z,A;if(typeof g=="object"&&g)if(l.call(g)=="[object Date]"&&!n.call(g,"toJSON"))if(g>-1/0&&g<1/0){if(y){t=r(g/864E5);for(k=r(t/365.2425)+1970-1;y(k+1,0)<=t;k++);for(s=r((t-y(k,0))/30.42);y(k,s+1)<=t;s++);t=1+t-y(k,s);i=(g%864E5+864E5)%864E5;o=r(i/36E5)%24;u=r(i/6E4)%60;v=r(i/1E3)%60;i=i%1E3}else{k=g.getUTCFullYear();s=g.getUTCMonth();t=g.getUTCDate();
+o=g.getUTCHours();u=g.getUTCMinutes();v=g.getUTCSeconds();i=g.getUTCMilliseconds()}g=(k<=0||k>=1E4?(k<0?"-":"+")+q(6,k<0?-k:k):q(4,k))+"-"+q(2,s+1)+"-"+q(2,t)+"T"+q(2,o)+":"+q(2,u)+":"+q(2,v)+"."+q(3,i)+"Z"}else g=w;else typeof g.toJSON=="function"&&(g=g.toJSON(b));a&&(g=a.call(e,b,g));if(g===w)return"null";k=l.call(g);switch(k){case "[object Boolean]":return""+g;case "[object Number]":return g>-1/0&&g<1/0?""+g:"null";case "[object String]":return E(g)}if(typeof g=="object"){for(b=f.length;b--;)f[b]===
+g&&j(TypeError());f.push(g);z=[];e=h;h=h+c;if(k=="[object Array]"){s=0;for(b=g.length;s<b;A||(A=p),s++){k=B(s,g,a,d,c,h,f);z.push(k===m?"null":k)}return A?c?"[\n"+h+z.join(",\n"+h)+"\n"+e+"]":"["+z.join(",")+"]":"[]"}C(d||g,function(b){var e=B(b,g,a,d,c,h,f);e!==m&&z.push(E(b)+":"+(c?" ":"")+e);A||(A=p)});return A?c?"{\n"+h+z.join(",\n"+h)+"\n"+e+"}":"{"+z.join(",")+"}":"{}"}},c.stringify=function(b,e,a){var c,f,h,i,g;if(typeof e=="function"||typeof e=="object"&&e)if(l.call(e)=="[object Function]")f=
+e;else if(l.call(e)=="[object Array]"){h={};for(i=e.length;i--;(g=e[i])&&(l.call(g)=="[object String]"||l.call(g)=="[object Number]")&&(h[g]=1));}if(a)if(l.call(a)=="[object Number]"){if((a=a-a%1)>0){c="";for(a>10&&(a=10);c.length<a;c=c+" ");}}else l.call(a)=="[object String]"&&(c=a.length<=10?a:a.slice(0,10));return B("",(g={},g[""]=b,g),f,h,c,"",[])});i||(G="".constructor.fromCharCode,H={"\\":"\\",'"':'"',"/":"/",b:"\u0008",t:"\t",n:"\n",f:"\u000c",r:"\r"},u=function(b){this.source=b;this.index=
+0},u.prototype.a=function(){for(var b=this.source,c=this.source.length,a,d,f,h,i;this.index<c;){a=b.charAt(this.index);switch(a){case "\t":case "\r":case "\n":case " ":this.index++;break;case "{":case "}":case "[":case "]":case ":":case ",":this.index++;return a;case '"':d="@";for(this.index++;this.index<c;){a=b.charAt(this.index);a<" "&&j(SyntaxError());if(a=="\\"){this.index++;a=b.charAt(this.index);if('\\"/btnfr'.indexOf(a)>-1){d=d+H[a];this.index++}else if(a=="u"){f=++this.index;for(h=this.index+
+4;this.index<h;this.index++){a=b.charAt(this.index);a>="0"&&a<="9"||a>="a"&&a<="f"||a>="A"&&a<="F"||j(SyntaxError())}d=d+G("0x"+b.slice(f,this.index))}else j(SyntaxError())}else{if(a=='"')break;d=d+a;this.index++}}if(b.charAt(this.index)=='"'){this.index++;return d}j(SyntaxError());default:f=this.index;if(a=="-"){i=p;a=b.charAt(++this.index)}if(a>="0"&&a<="9"){for(a=="0"&&(a=b.charAt(this.index+1),a>="0"&&a<="9")&&j(SyntaxError());this.index<c&&(a=b.charAt(this.index),a>="0"&&a<="9");this.index++);
+if(b.charAt(this.index)=="."){for(h=++this.index;h<c&&(a=b.charAt(h),a>="0"&&a<="9");h++);h==this.index&&j(SyntaxError());this.index=h}a=b.charAt(this.index);if(a=="e"||a=="E"){a=b.charAt(++this.index);(a=="+"||a=="-")&&this.index++;for(h=this.index;h<c&&(a=b.charAt(h),a>="0"&&a<="9");h++);h==this.index&&j(SyntaxError());this.index=h}return+b.slice(f,this.index)}i&&j(SyntaxError());if(b.slice(this.index,this.index+4)=="true"){this.index=this.index+4;return p}if(b.slice(this.index,this.index+5)=="false"){this.index=
+this.index+5;return x}if(b.slice(this.index,this.index+4)=="null"){this.index=this.index+4;return w}j(SyntaxError())}}return"$"},u.prototype.get=function(b){var c,a;b=="$"&&j(SyntaxError());if(typeof b=="string"){if(b.charAt(0)=="@")return b.slice(1);switch(b){case "[":for(c=[];;a||(a=p)){b=this.a();if(b=="]")break;if(a)if(b==","){b=this.a();b=="]"&&j(SyntaxError())}else j(SyntaxError());b==","&&j(SyntaxError());c.push(this.get(b))}return c;case "{":for(c={};;a||(a=p)){b=this.a();if(b=="}")break;
+if(a)if(b==","){b=this.a();b=="}"&&j(SyntaxError())}else j(SyntaxError());b==","&&j(SyntaxError());(typeof b!="string"||b.charAt(0)!="@")&&j(SyntaxError());this.a()!=":"&&j(SyntaxError());c[b.slice(1)]=this.get(this.a())}return c}j(SyntaxError())}return b},v=function(b,c,a){var d=b[c],f,h;if(typeof d=="object"&&d)if(l.call(d)=="[object Array]")for(f=d.length;f--;){h=v(d,f,a);h===m?d.splice(f,1):d[f]=h}else C(d,function(b){var c=v(d,b,a);c===m?delete d[b]:d[b]=c});return a.call(b,c,d)},c.parse=function(b,
+c){var a=new u(""+b),d=a.get(a.a()),f;a.a()!="$"&&j(SyntaxError());return c&&l.call(c)=="[object Function]"?v((f={},f[""]=d,f),"",c):d})}}).call(this);
+}());
\ No newline at end of file
diff --git a/scripts/thinbox.js b/scripts/thinbox.js
index 9a1eb37..8112f23 100644
--- a/scripts/thinbox.js
+++ b/scripts/thinbox.js
@@ -1,266 +1,266 @@
-var ThinBox = {
-	modals: [],
-	remove: function() {
-		$(this.modals[0]).data('thinbox').remove();
-		return false;
-	},
-	resize: function(width,height) {
-		$(this.modals[0]).data('thinbox').resize(width,height);
-		return false;
-	},
-	onShow: function(self) {}
-};
-(function($){
-	var defaultSettings = {
-		width: '417px',
-		height: '250px',
-		margin: '0 auto',
-		top: '10%',
-		clickClose: true,
-		fullHeight: false,
-		animateResize: true,
-		showCloseButton: true,
-		fullHeightPadding: '30',
-		thinboxModalBG: 'thinboxModalBG',
-		thinboxModalContent: 'thinboxModalContent',
-		thinboxModalContentBG: 'thinboxModalContentBG',
-		thinboxModalCloseButton: 'thinboxModalCloseButton',
-		thinboxModalContentBGColor: '#000',
-		thinboxModalContentBGOpacity: '40',
-		//closeButton: '/ui/images/icons/tb-close-button.gif',
-		onShow: function() { }
-	};
-	
-	var Thinbox = function(element,options) {
-		if(element==null) {
-			var singleMode = true;
-		} else {
-			var singleMode = false;
-			element = $(element);
-		}
-		var self = this;
-		this.settings = $.extend(defaultSettings,options||{});
-		
-		this.init = function() {
-			if(!singleMode) {
-				self.bindClick();
-			}
-		};
-		
-		this.bindClick = function() {
-			element.bind('click',function(){
-				self.showModal(element);
-				return false;
-			});
-		};
-		
-		this.getContentElement = function() {
-			return $("#"+self.settings.thinboxModalContent);
-		};
-		
-		this.setupModal = function(vars) {
-			var thinboxBG = $('<div/>').attr('id',self.settings.thinboxModalBG);
-			var thinboxModalContent = $('<div/>').attr('id',self.settings.thinboxModalContent).addClass(self.settings.thinboxModalContent);
-			var thinboxModalContentBG = $('<div/>').attr('id',self.settings.thinboxModalContentBG);
-			
-			$(thinboxBG).css({
-				'height': $(window).height(),
-				'width': $(window).width(),
-				'position': 'fixed',
-				'display': 'none',
-				'top': '0',
-				'left': '0'
-			}).appendTo('body');
-			
-			$(thinboxModalContentBG).css({
-				'height': $(window).height(),
-				'width': $(window).width(),
-				'position': 'absolute',
-				'top': '0',
-				'left': '0',
-				'background': self.settings.thinboxModalContentBGColor,
-				'opacity': '.'+self.settings.thinboxModalContentBGOpacity,
-				'filter': 'alpha(opacity='+self.settings.thinboxModalContentBGOpacity+')',
-				'zIndex': '999999'
-			}).appendTo(thinboxBG);
-			
-			var boxHeight = self.settings.height;
-			var boxWidth = self.settings.width;
-			if(vars.isImage) {
-				boxHeight = '';
-				boxWidth = vars.thinboxImage.width;
-				if(boxWidth>950) {
-					boxWidth = 950;
-					$(vars.thinboxContent).css({
-						'height': 'auto',
-						'width': 950
-					});
-				}
-				if(vars.thinboxImage.height>500) {
-					$(vars.thinboxContent).css({
-						'height': 500,
-						'width': 'auto'
-					});
-				}
-			}
-			
-			$(thinboxModalContent).css({
-				'height': boxHeight,
-				'width': boxWidth,
-				'margin': self.settings.margin,
-				'top': self.settings.top,
-				'position': 'relative',
-				'zIndex': '9999999'
-			}).html(vars.thinboxContent).appendTo(thinboxBG);
-			
-			if(vars.isImage && vars.imageDesc) $(vars.imageDesc).appendTo(thinboxModalContent);
-			
-			if(vars.isImage && self.settings.showCloseButton) {
-				var imageCloseButton = '<a class="jsThinboxClose '+self.settings.thinboxModalCloseButton+'">X</a>';
-				$(imageCloseButton).appendTo(thinboxModalContent);
-			}
-			
-			if(vars.inIframe) {
-				$(thinboxModalContent).css({
-					'overflow': 'hidden'
-				});
-			}
-			
-			if(self.settings.clickClose) {
-				$(thinboxBG).bind('click',function(){
-					self.remove(); 
-				 });
-			
-				$(thinboxModalContent).bind('click',function(event){  
-					if(event.stopPropagation) event.stopPropagation();
-					else event.cancelBubble = true;
-				});
-			}
-			
-			if(self.settings.fullHeight) {
-				self.resizeHeight();
-			}
-			
-			$('.jsThinboxClose',thinboxModalContent).bind('click',function() {
-				self.remove();
-				return false;
-			});
-			
-			$(window).bind('resize',function(){
-				self.resizeBG();
-				self.resizeBG(); /* Dirty hack for scrollbars */
-				if(self.settings.fullHeight) self.resizeHeight();
-			});
-			
-			$(thinboxBG).show();
-			self.settings.onShow(self);
-			
-			if($.browser.msie && $.browser.version<=6) window.location = "#";
-		};
-		
-		this.showModal = function(element,url) {
-			if(url!=null) {
-				var href = url;
-			} else {
-				var href = $(element).attr("href")||$(element).attr("alt")||'';
-			}
-			var imageUrl = /\.(jpe?g|png|gif|bmp)/gi;
-			var isImage = false;
-			if(href.substr(0,1)=="#") {
-				var thinboxContent = $(href).html();
-				var inIframe = false;
-			} else if(href.match(imageUrl)) {
-				var thinboxImage = new Image();
-				var thinboxContent = $("<img>").attr("src",href);
-				var imageDesc = $('<p/>').html($($('img',element).attr('title')).html()||"&nbsp;");
-				var inIframe = false;
-				var isImage = true;
-			} else if(href=='') {
-				 return false;
-			} else {
-				var thinboxContent = $("<div style='height:100%;width:100%;background-color:#fff;'><div style='width:100%;padding:4px;background-color:#FFC10E;;text-align:left;'>BETA VERSION<input type='button' value='X' onclick='ThinBox.remove()' style='font-size: 1em;float:right;margin-right:10px;border:none;cursor:pointer;background-color:#FFC10E;'/></div><br/><br/><div style='padding:20px;'>OpenCounter is in beta<br/><br/>this will be more of a warning and will be styled soon</div></div>");
-				//thinboxContent.attr("src",href);
-				var inIframe = true;
-			}
-			
-			var vars = {
-				'thinboxContent': thinboxContent,
-				'inIframe': inIframe,
-				'thinboxImage': thinboxImage,
-				'imageDesc': imageDesc,
-				'isImage': isImage
-			}
-			
-			if(isImage) {
-				thinboxImage.onload = function() {
-					self.setupModal(vars);
-				}
-				thinboxImage.src = href;
-			} else {
-				this.setupModal(vars);
-			}
-			
-			return false;
-		};
-		
-		this.resizeBG = function() {
-			$('#'+self.settings.thinboxModalBG).css({
-				'height':$(window).height(),
-				'width': $(window).width()
-			});
-			$('#'+self.settings.thinboxModalContentBG).css({
-				'height':$(window).height(),
-				'width': $(window).width()
-			});
-		};
-		
-		this.resizeHeight = function() {
-			var height = parseInt($(window).height())-(parseInt(self.settings.fullHeightPadding)*2);
-			$('#'+self.settings.thinboxModalContent).css({
-				'height': height,
-				'top': self.settings.fullHeightPadding+'px'
-			});
-		}
-		
-		this.remove = function() {
-			$('#'+self.settings.thinboxModalBG).remove();
-			return false;
-		};
-		
-		this.resize = function(width,height) {
-			var newSizes = {
-				'height': height+'px',
-				'width': width+'px'
-			};
-			if(self.settings.animateResize) {
-				$('#'+self.settings.thinboxModalContent).animate(newSizes);
-			} else {
-				$('#'+self.settings.thinboxModalContent).css(newSizes);
-			}
-		}
-		
-		this.init();
-	};
-	$.fn.thinbox = function(options) {
-		ThinBox.options = options;
-		return this.each(function(){
-			var element = $(this);
-			if(element.data('thinbox')) return;
-			var thinbox = new Thinbox(this,options);
-			element.data('thinbox',thinbox);
-		});
-	};
-	
-	$(document).ready(function(){
-		ThinBox.modals = $("a[rel*='thinbox'],a.thinbox,input.thinbox").thinbox({
-			onShow: function() { ThinBox.onShow(self); }
-		});
-	});
-	
-	ThinBox.open = function(url,options) {
-		settings = $.extend(defaultSettings,options||{});
-		thinbox = new Thinbox(null,settings);
-		ThinBox.modals.push($(document).data('thinbox',thinbox));
-		thinbox.showModal('',url);
-	}
-})(jQuery);
+var ThinBox = {
+	modals: [],
+	remove: function() {
+		$(this.modals[0]).data('thinbox').remove();
+		return false;
+	},
+	resize: function(width,height) {
+		$(this.modals[0]).data('thinbox').resize(width,height);
+		return false;
+	},
+	onShow: function(self) {}
+};
+(function($){
+	var defaultSettings = {
+		width: '417px',
+		height: '250px',
+		margin: '0 auto',
+		top: '10%',
+		clickClose: true,
+		fullHeight: false,
+		animateResize: true,
+		showCloseButton: true,
+		fullHeightPadding: '30',
+		thinboxModalBG: 'thinboxModalBG',
+		thinboxModalContent: 'thinboxModalContent',
+		thinboxModalContentBG: 'thinboxModalContentBG',
+		thinboxModalCloseButton: 'thinboxModalCloseButton',
+		thinboxModalContentBGColor: '#000',
+		thinboxModalContentBGOpacity: '40',
+		//closeButton: '/ui/images/icons/tb-close-button.gif',
+		onShow: function() { }
+	};
+	
+	var Thinbox = function(element,options) {
+		if(element==null) {
+			var singleMode = true;
+		} else {
+			var singleMode = false;
+			element = $(element);
+		}
+		var self = this;
+		this.settings = $.extend(defaultSettings,options||{});
+		
+		this.init = function() {
+			if(!singleMode) {
+				self.bindClick();
+			}
+		};
+		
+		this.bindClick = function() {
+			element.bind('click',function(){
+				self.showModal(element);
+				return false;
+			});
+		};
+		
+		this.getContentElement = function() {
+			return $("#"+self.settings.thinboxModalContent);
+		};
+		
+		this.setupModal = function(vars) {
+			var thinboxBG = $('<div/>').attr('id',self.settings.thinboxModalBG);
+			var thinboxModalContent = $('<div/>').attr('id',self.settings.thinboxModalContent).addClass(self.settings.thinboxModalContent);
+			var thinboxModalContentBG = $('<div/>').attr('id',self.settings.thinboxModalContentBG);
+			
+			$(thinboxBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'fixed',
+				'display': 'none',
+				'top': '0',
+				'left': '0'
+			}).appendTo('body');
+			
+			$(thinboxModalContentBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'absolute',
+				'top': '0',
+				'left': '0',
+				'background': self.settings.thinboxModalContentBGColor,
+				'opacity': '.'+self.settings.thinboxModalContentBGOpacity,
+				'filter': 'alpha(opacity='+self.settings.thinboxModalContentBGOpacity+')',
+				'zIndex': '999999'
+			}).appendTo(thinboxBG);
+			
+			var boxHeight = self.settings.height;
+			var boxWidth = self.settings.width;
+			if(vars.isImage) {
+				boxHeight = '';
+				boxWidth = vars.thinboxImage.width;
+				if(boxWidth>950) {
+					boxWidth = 950;
+					$(vars.thinboxContent).css({
+						'height': 'auto',
+						'width': 950
+					});
+				}
+				if(vars.thinboxImage.height>500) {
+					$(vars.thinboxContent).css({
+						'height': 500,
+						'width': 'auto'
+					});
+				}
+			}
+			
+			$(thinboxModalContent).css({
+				'height': boxHeight,
+				'width': boxWidth,
+				'margin': self.settings.margin,
+				'top': self.settings.top,
+				'position': 'relative',
+				'zIndex': '9999999'
+			}).html(vars.thinboxContent).appendTo(thinboxBG);
+			
+			if(vars.isImage && vars.imageDesc) $(vars.imageDesc).appendTo(thinboxModalContent);
+			
+			if(vars.isImage && self.settings.showCloseButton) {
+				var imageCloseButton = '<a class="jsThinboxClose '+self.settings.thinboxModalCloseButton+'">X</a>';
+				$(imageCloseButton).appendTo(thinboxModalContent);
+			}
+			
+			if(vars.inIframe) {
+				$(thinboxModalContent).css({
+					'overflow': 'hidden'
+				});
+			}
+			
+			if(self.settings.clickClose) {
+				$(thinboxBG).bind('click',function(){
+					self.remove(); 
+				 });
+			
+				$(thinboxModalContent).bind('click',function(event){  
+					if(event.stopPropagation) event.stopPropagation();
+					else event.cancelBubble = true;
+				});
+			}
+			
+			if(self.settings.fullHeight) {
+				self.resizeHeight();
+			}
+			
+			$('.jsThinboxClose',thinboxModalContent).bind('click',function() {
+				self.remove();
+				return false;
+			});
+			
+			$(window).bind('resize',function(){
+				self.resizeBG();
+				self.resizeBG(); /* Dirty hack for scrollbars */
+				if(self.settings.fullHeight) self.resizeHeight();
+			});
+			
+			$(thinboxBG).show();
+			self.settings.onShow(self);
+			
+			if($.browser.msie && $.browser.version<=6) window.location = "#";
+		};
+		
+		this.showModal = function(element,url) {
+			if(url!=null) {
+				var href = url;
+			} else {
+				var href = $(element).attr("href")||$(element).attr("alt")||'';
+			}
+			var imageUrl = /\.(jpe?g|png|gif|bmp)/gi;
+			var isImage = false;
+			if(href.substr(0,1)=="#") {
+				var thinboxContent = $(href).html();
+				var inIframe = false;
+			} else if(href.match(imageUrl)) {
+				var thinboxImage = new Image();
+				var thinboxContent = $("<img>").attr("src",href);
+				var imageDesc = $('<p/>').html($($('img',element).attr('title')).html()||"&nbsp;");
+				var inIframe = false;
+				var isImage = true;
+			} else if(href=='') {
+				 return false;
+			} else {
+				var thinboxContent = $("<div style='height:100%;width:100%;background-color:#fff;'><div style='width:100%;padding:4px;background-color:#FFC10E;;text-align:left;'>BETA VERSION<input type='button' value='X' onclick='ThinBox.remove()' style='font-size: 1em;float:right;margin-right:10px;border:none;cursor:pointer;background-color:#FFC10E;'/></div><br/><br/><div style='padding:20px;'>OpenCounter is in beta<br/><br/>this will be more of a warning and will be styled soon</div></div>");
+				//thinboxContent.attr("src",href);
+				var inIframe = true;
+			}
+			
+			var vars = {
+				'thinboxContent': thinboxContent,
+				'inIframe': inIframe,
+				'thinboxImage': thinboxImage,
+				'imageDesc': imageDesc,
+				'isImage': isImage
+			}
+			
+			if(isImage) {
+				thinboxImage.onload = function() {
+					self.setupModal(vars);
+				}
+				thinboxImage.src = href;
+			} else {
+				this.setupModal(vars);
+			}
+			
+			return false;
+		};
+		
+		this.resizeBG = function() {
+			$('#'+self.settings.thinboxModalBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+			$('#'+self.settings.thinboxModalContentBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+		};
+		
+		this.resizeHeight = function() {
+			var height = parseInt($(window).height())-(parseInt(self.settings.fullHeightPadding)*2);
+			$('#'+self.settings.thinboxModalContent).css({
+				'height': height,
+				'top': self.settings.fullHeightPadding+'px'
+			});
+		}
+		
+		this.remove = function() {
+			$('#'+self.settings.thinboxModalBG).remove();
+			return false;
+		};
+		
+		this.resize = function(width,height) {
+			var newSizes = {
+				'height': height+'px',
+				'width': width+'px'
+			};
+			if(self.settings.animateResize) {
+				$('#'+self.settings.thinboxModalContent).animate(newSizes);
+			} else {
+				$('#'+self.settings.thinboxModalContent).css(newSizes);
+			}
+		}
+		
+		this.init();
+	};
+	$.fn.thinbox = function(options) {
+		ThinBox.options = options;
+		return this.each(function(){
+			var element = $(this);
+			if(element.data('thinbox')) return;
+			var thinbox = new Thinbox(this,options);
+			element.data('thinbox',thinbox);
+		});
+	};
+	
+	$(document).ready(function(){
+		ThinBox.modals = $("a[rel*='thinbox'],a.thinbox,input.thinbox").thinbox({
+			onShow: function() { ThinBox.onShow(self); }
+		});
+	});
+	
+	ThinBox.open = function(url,options) {
+		settings = $.extend(defaultSettings,options||{});
+		thinbox = new Thinbox(null,settings);
+		ThinBox.modals.push($(document).data('thinbox',thinbox));
+		thinbox.showModal('',url);
+	}
+})(jQuery);
diff --git a/scripts/thinbox2.js b/scripts/thinbox2.js
new file mode 100644
index 0000000..2de4156
--- /dev/null
+++ b/scripts/thinbox2.js
@@ -0,0 +1,266 @@
+var ThinBox = {
+	modals: [],
+	remove: function() {
+		$(this.modals[0]).data('thinbox').remove();
+		return false;
+	},
+	resize: function(width,height) {
+		$(this.modals[0]).data('thinbox').resize(width,height);
+		return false;
+	},
+	onShow: function(self) {}
+};
+(function($){
+	var defaultSettings = {
+		width: '417px',
+		height: '250px',
+		margin: '0 auto',
+		top: '10%',
+		clickClose: true,
+		fullHeight: false,
+		animateResize: true,
+		showCloseButton: true,
+		fullHeightPadding: '30',
+		thinboxModalBG: 'thinboxModalBG',
+		thinboxModalContent: 'thinboxModalContent',
+		thinboxModalContentBG: 'thinboxModalContentBG',
+		thinboxModalCloseButton: 'thinboxModalCloseButton',
+		thinboxModalContentBGColor: '#000',
+		thinboxModalContentBGOpacity: '40',
+		//closeButton: '/ui/images/icons/tb-close-button.gif',
+		onShow: function() { }
+	};
+	
+	var Thinbox = function(element,options) {
+		if(element==null) {
+			var singleMode = true;
+		} else {
+			var singleMode = false;
+			element = $(element);
+		}
+		var self = this;
+		this.settings = $.extend(defaultSettings,options||{});
+		
+		this.init = function() {
+			if(!singleMode) {
+				self.bindClick();
+			}
+		};
+		
+		this.bindClick = function() {
+			element.bind('click',function(){
+				self.showModal(element);
+				return false;
+			});
+		};
+		
+		this.getContentElement = function() {
+			return $("#"+self.settings.thinboxModalContent);
+		};
+		
+		this.setupModal = function(vars) {
+			var thinboxBG = $('<div/>').attr('id',self.settings.thinboxModalBG);
+			var thinboxModalContent = $('<div/>').attr('id',self.settings.thinboxModalContent).addClass(self.settings.thinboxModalContent);
+			var thinboxModalContentBG = $('<div/>').attr('id',self.settings.thinboxModalContentBG);
+			
+			$(thinboxBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'fixed',
+				'display': 'none',
+				'top': '0',
+				'left': '0'
+			}).appendTo('body');
+			
+			$(thinboxModalContentBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'absolute',
+				'top': '0',
+				'left': '0',
+				'background': self.settings.thinboxModalContentBGColor,
+				'opacity': '.'+self.settings.thinboxModalContentBGOpacity,
+				'filter': 'alpha(opacity='+self.settings.thinboxModalContentBGOpacity+')',
+				'zIndex': '999999'
+			}).appendTo(thinboxBG);
+			
+			var boxHeight = self.settings.height;
+			var boxWidth = self.settings.width;
+			if(vars.isImage) {
+				boxHeight = '';
+				boxWidth = vars.thinboxImage.width;
+				if(boxWidth>950) {
+					boxWidth = 950;
+					$(vars.thinboxContent).css({
+						'height': 'auto',
+						'width': 950
+					});
+				}
+				if(vars.thinboxImage.height>500) {
+					$(vars.thinboxContent).css({
+						'height': 500,
+						'width': 'auto'
+					});
+				}
+			}
+			
+			$(thinboxModalContent).css({
+				'height': boxHeight,
+				'width': boxWidth,
+				'margin': self.settings.margin,
+				'top': self.settings.top,
+				'position': 'relative',
+				'zIndex': '9999999'
+			}).html(vars.thinboxContent).appendTo(thinboxBG);
+			
+			if(vars.isImage && vars.imageDesc) $(vars.imageDesc).appendTo(thinboxModalContent);
+			
+			if(vars.isImage && self.settings.showCloseButton) {
+				var imageCloseButton = '<a class="jsThinboxClose '+self.settings.thinboxModalCloseButton+'">X</a>';
+				$(imageCloseButton).appendTo(thinboxModalContent);
+			}
+			
+			if(vars.inIframe) {
+				$(thinboxModalContent).css({
+					'overflow': 'hidden'
+				});
+			}
+			
+			if(self.settings.clickClose) {
+				$(thinboxBG).bind('click',function(){
+					self.remove(); 
+				 });
+			
+				$(thinboxModalContent).bind('click',function(event){  
+					if(event.stopPropagation) event.stopPropagation();
+					else event.cancelBubble = true;
+				});
+			}
+			
+			if(self.settings.fullHeight) {
+				self.resizeHeight();
+			}
+			
+			$('.jsThinboxClose',thinboxModalContent).bind('click',function() {
+				self.remove();
+				return false;
+			});
+			
+			$(window).bind('resize',function(){
+				self.resizeBG();
+				self.resizeBG(); /* Dirty hack for scrollbars */
+				if(self.settings.fullHeight) self.resizeHeight();
+			});
+			
+			$(thinboxBG).show();
+			self.settings.onShow(self);
+			
+			if($.browser.msie && $.browser.version<=6) window.location = "#";
+		};
+		
+		this.showModal = function(element,url) {
+			if(url!=null) {
+				var href = url;
+			} else {
+				var href = $(element).attr("href")||$(element).attr("alt")||'';
+			}
+			var imageUrl = /\.(jpe?g|png|gif|bmp)/gi;
+			var isImage = false;
+			if(href.substr(0,1)=="#") {
+				var thinboxContent = $(href).html();
+				var inIframe = false;
+			} else if(href.match(imageUrl)) {
+				var thinboxImage = new Image();
+				var thinboxContent = $("<img>").attr("src",href);
+				var imageDesc = $('<p/>').html($($('img',element).attr('title')).html()||"&nbsp;");
+				var inIframe = false;
+				var isImage = true;
+			} else if(href=='') {
+				 return false;
+			} else {
+				var thinboxContent = $("<div class='betabox'><div class='betabox2'>BETA WARNING<input type='button' value='X' onclick='ThinBox.remove()' class='betax'/></div><br/><div class='betabox3'>Welcome to Open Counter, a site built for the <a href='http://www.cityofsantacruz.com/' target='_blank'>City of Santa Cruz</a> by <a href='http://codeforamerica.org/' target='_blank'>Code for America</a>.</br></br>PLEASE NOTE:</br></br>This is an experimental/beta version of the site. It may contain inaccuracies!!</br></br>Your suggestions will help make this site better, so if you have any comments please click on the tab to the left and leave feedback.</div></div>");
+				//thinboxContent.attr("src",href);
+				var inIframe = true;
+			}
+			
+			var vars = {
+				'thinboxContent': thinboxContent,
+				'inIframe': inIframe,
+				'thinboxImage': thinboxImage,
+				'imageDesc': imageDesc,
+				'isImage': isImage
+			}
+			
+			if(isImage) {
+				thinboxImage.onload = function() {
+					self.setupModal(vars);
+				}
+				thinboxImage.src = href;
+			} else {
+				this.setupModal(vars);
+			}
+			
+			return false;
+		};
+		
+		this.resizeBG = function() {
+			$('#'+self.settings.thinboxModalBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+			$('#'+self.settings.thinboxModalContentBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+		};
+		
+		this.resizeHeight = function() {
+			var height = parseInt($(window).height())-(parseInt(self.settings.fullHeightPadding)*2);
+			$('#'+self.settings.thinboxModalContent).css({
+				'height': height,
+				'top': self.settings.fullHeightPadding+'px'
+			});
+		}
+		
+		this.remove = function() {
+			$('#'+self.settings.thinboxModalBG).remove();
+			return false;
+		};
+		
+		this.resize = function(width,height) {
+			var newSizes = {
+				'height': height+'px',
+				'width': width+'px'
+			};
+			if(self.settings.animateResize) {
+				$('#'+self.settings.thinboxModalContent).animate(newSizes);
+			} else {
+				$('#'+self.settings.thinboxModalContent).css(newSizes);
+			}
+		}
+		
+		this.init();
+	};
+	$.fn.thinbox = function(options) {
+		ThinBox.options = options;
+		return this.each(function(){
+			var element = $(this);
+			if(element.data('thinbox')) return;
+			var thinbox = new Thinbox(this,options);
+			element.data('thinbox',thinbox);
+		});
+	};
+	
+	$(document).ready(function(){
+		ThinBox.modals = $("a[rel*='thinbox'],a.thinbox,input.thinbox").thinbox({
+			onShow: function() { ThinBox.onShow(self); }
+		});
+	});
+	
+	ThinBox.open = function(url,options) {
+		settings = $.extend(defaultSettings,options||{});
+		thinbox = new Thinbox(null,settings);
+		ThinBox.modals.push($(document).data('thinbox',thinbox));
+		thinbox.showModal('',url);
+	}
+})(jQuery);
diff --git a/scripts/thinboxbad.js b/scripts/thinboxbad.js
new file mode 100644
index 0000000..ee77240
--- /dev/null
+++ b/scripts/thinboxbad.js
@@ -0,0 +1,266 @@
+var ThinBox = {
+	modals: [],
+	remove: function() {
+		$(this.modals[0]).data('thinbox').remove();
+		return false;
+	},
+	resize: function(width,height) {
+		$(this.modals[0]).data('thinbox').resize(width,height);
+		return false;
+	},
+	onShow: function(self) {}
+};
+(function($){
+	var defaultSettings = {
+		width: '417px',
+		height: '250px',
+		margin: '0 auto',
+		top: '10%',
+		clickClose: true,
+		fullHeight: false,
+		animateResize: true,
+		showCloseButton: true,
+		fullHeightPadding: '30',
+		thinboxModalBG: 'thinboxModalBG',
+		thinboxModalContent: 'thinboxModalContent',
+		thinboxModalContentBG: 'thinboxModalContentBG',
+		thinboxModalCloseButton: 'thinboxModalCloseButton',
+		thinboxModalContentBGColor: '#000',
+		thinboxModalContentBGOpacity: '40',
+		//closeButton: '/ui/images/icons/tb-close-button.gif',
+		onShow: function() { }
+	};
+	
+	var Thinbox = function(element,options) {
+		if(element==null) {
+			var singleMode = true;
+		} else {
+			var singleMode = false;
+			element = $(element);
+		}
+		var self = this;
+		this.settings = $.extend(defaultSettings,options||{});
+		
+		this.init = function() {
+			if(!singleMode) {
+				self.bindClick();
+			}
+		};
+		
+		this.bindClick = function() {
+			element.bind('click',function(){
+				self.showModal(element);
+				return false;
+			});
+		};
+		
+		this.getContentElement = function() {
+			return $("#"+self.settings.thinboxModalContent);
+		};
+		
+		this.setupModal = function(vars) {
+			var thinboxBG = $('<div/>').attr('id',self.settings.thinboxModalBG);
+			var thinboxModalContent = $('<div/>').attr('id',self.settings.thinboxModalContent).addClass(self.settings.thinboxModalContent);
+			var thinboxModalContentBG = $('<div/>').attr('id',self.settings.thinboxModalContentBG);
+			
+			$(thinboxBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'fixed',
+				'display': 'none',
+				'top': '0',
+				'left': '0'
+			}).appendTo('body');
+			
+			$(thinboxModalContentBG).css({
+				'height': $(window).height(),
+				'width': $(window).width(),
+				'position': 'absolute',
+				'top': '0',
+				'left': '0',
+				'background': self.settings.thinboxModalContentBGColor,
+				'opacity': '.'+self.settings.thinboxModalContentBGOpacity,
+				'filter': 'alpha(opacity='+self.settings.thinboxModalContentBGOpacity+')',
+				'zIndex': '999999'
+			}).appendTo(thinboxBG);
+			
+			var boxHeight = self.settings.height;
+			var boxWidth = self.settings.width;
+			if(vars.isImage) {
+				boxHeight = '';
+				boxWidth = vars.thinboxImage.width;
+				if(boxWidth>950) {
+					boxWidth = 950;
+					$(vars.thinboxContent).css({
+						'height': 'auto',
+						'width': 950
+					});
+				}
+				if(vars.thinboxImage.height>500) {
+					$(vars.thinboxContent).css({
+						'height': 500,
+						'width': 'auto'
+					});
+				}
+			}
+			
+			$(thinboxModalContent).css({
+				'height': boxHeight,
+				'width': boxWidth,
+				'margin': self.settings.margin,
+				'top': self.settings.top,
+				'position': 'relative',
+				'zIndex': '9999999'
+			}).html(vars.thinboxContent).appendTo(thinboxBG);
+			
+			if(vars.isImage && vars.imageDesc) $(vars.imageDesc).appendTo(thinboxModalContent);
+			
+			if(vars.isImage && self.settings.showCloseButton) {
+				var imageCloseButton = '<a class="jsThinboxClose '+self.settings.thinboxModalCloseButton+'">X</a>';
+				$(imageCloseButton).appendTo(thinboxModalContent);
+			}
+			
+			if(vars.inIframe) {
+				$(thinboxModalContent).css({
+					'overflow': 'hidden'
+				});
+			}
+			
+			if(self.settings.clickClose) {
+				$(thinboxBG).bind('click',function(){
+					self.remove(); 
+				 });
+			
+				$(thinboxModalContent).bind('click',function(event){  
+					if(event.stopPropagation) event.stopPropagation();
+					else event.cancelBubble = true;
+				});
+			}
+			
+			if(self.settings.fullHeight) {
+				self.resizeHeight();
+			}
+			
+			$('.jsThinboxClose',thinboxModalContent).bind('click',function() {
+				self.remove();
+				return false;
+			});
+			
+			$(window).bind('resize',function(){
+				self.resizeBG();
+				self.resizeBG(); /* Dirty hack for scrollbars */
+				if(self.settings.fullHeight) self.resizeHeight();
+			});
+			
+			$(thinboxBG).show();
+			self.settings.onShow(self);
+			
+			if($.browser.msie && $.browser.version<=6) window.location = "#";
+		};
+		
+		this.showModal = function(element,url) {
+			if(url!=null) {
+				var href = url;
+			} else {
+				var href = $(element).attr("href")||$(element).attr("alt")||'';
+			}
+			var imageUrl = /\.(jpe?g|png|gif|bmp)/gi;
+			var isImage = false;
+			if(href.substr(0,1)=="#") {
+				var thinboxContent = $(href).html();
+				var inIframe = false;
+			} else if(href.match(imageUrl)) {
+				var thinboxImage = new Image();
+				var thinboxContent = $("<img>").attr("src",href);
+				var imageDesc = $('<p/>').html($($('img',element).attr('title')).html()||"&nbsp;");
+				var inIframe = false;
+				var isImage = true;
+			} else if(href=='') {
+				 return false;
+			} else {
+				var thinboxContent = $("<div style='betabox'><div style='betabox2'>BETA VERSION<input type='button' value='X' onclick='ThinBox.remove()' style='betax'/></div><br/><br/><div style='betabox3'>Welcome to Open Counter, an experimental (ÔbetaÕ) site built for the City of Santa Cruz by Code for America.</br></br>PLEASE BE AWARE Ð this is a test website and may contain inaccuracies.</br></br>Your suggestions will help us make this site better, so if you have any comments please click on the tab to the left and leave feedback.</div></div>");
+				//thinboxContent.attr("src",href);
+				var inIframe = true;
+			}
+			
+			var vars = {
+				'thinboxContent': thinboxContent,
+				'inIframe': inIframe,
+				'thinboxImage': thinboxImage,
+				'imageDesc': imageDesc,
+				'isImage': isImage
+			}
+			
+			if(isImage) {
+				thinboxImage.onload = function() {
+					self.setupModal(vars);
+				}
+				thinboxImage.src = href;
+			} else {
+				this.setupModal(vars);
+			}
+			
+			return false;
+		};
+		
+		this.resizeBG = function() {
+			$('#'+self.settings.thinboxModalBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+			$('#'+self.settings.thinboxModalContentBG).css({
+				'height':$(window).height(),
+				'width': $(window).width()
+			});
+		};
+		
+		this.resizeHeight = function() {
+			var height = parseInt($(window).height())-(parseInt(self.settings.fullHeightPadding)*2);
+			$('#'+self.settings.thinboxModalContent).css({
+				'height': height,
+				'top': self.settings.fullHeightPadding+'px'
+			});
+		}
+		
+		this.remove = function() {
+			$('#'+self.settings.thinboxModalBG).remove();
+			return false;
+		};
+		
+		this.resize = function(width,height) {
+			var newSizes = {
+				'height': height+'px',
+				'width': width+'px'
+			};
+			if(self.settings.animateResize) {
+				$('#'+self.settings.thinboxModalContent).animate(newSizes);
+			} else {
+				$('#'+self.settings.thinboxModalContent).css(newSizes);
+			}
+		}
+		
+		this.init();
+	};
+	$.fn.thinbox = function(options) {
+		ThinBox.options = options;
+		return this.each(function(){
+			var element = $(this);
+			if(element.data('thinbox')) return;
+			var thinbox = new Thinbox(this,options);
+			element.data('thinbox',thinbox);
+		});
+	};
+	
+	$(document).ready(function(){
+		ThinBox.modals = $("a[rel*='thinbox'],a.thinbox,input.thinbox").thinbox({
+			onShow: function() { ThinBox.onShow(self); }
+		});
+	});
+	
+	ThinBox.open = function(url,options) {
+		settings = $.extend(defaultSettings,options||{});
+		thinbox = new Thinbox(null,settings);
+		ThinBox.modals.push($(document).data('thinbox',thinbox));
+		thinbox.showModal('',url);
+	}
+})(jQuery);
diff --git a/search.php b/search.php
index df9ce49..0e8285b 100644
--- a/search.php
+++ b/search.php
@@ -22,10 +22,7 @@
 
 			<div <?php post_class(); ?>>
 				<h3 id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'kubrick'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h3>
-				<small><?php the_time('l, F jS, Y') ?></small>
-
-				<p class="postmetadata"><?php the_tags(__('Tags:', 'kubrick') . ' ', ', ', '<br />'); ?> <?php printf(__('Posted in %s', 'kubrick'), get_the_category_list(', ')); ?> | <?php edit_post_link(__('Edit', 'kubrick'), '', ' | '); ?>  <?php comments_popup_link(__('No Comments &#187;', 'kubrick'), __('1 Comment &#187;', 'kubrick'), __('% Comments &#187;', 'kubrick'), '', __('Comments Closed', 'kubrick') ); ?></p>
-			</div>
+				 </div>
 
 		<?php endwhile; ?>
 
@@ -43,6 +40,5 @@
 
 	</div>
 
-<?php get_sidebar(); ?>
 
 <?php get_footer(); ?>
diff --git a/style.css b/style.css
index 75af228..008c9a7 100644
--- a/style.css
+++ b/style.css
@@ -303,12 +303,7 @@ body {
         
      
         
- .progbar {
-	float: left;
-        margin-top: 30px;
-        font-size: 1.3em;
-	
-	}
+
 
 .widecolumn {
 	padding: 10px 0 20px 0;
@@ -884,9 +879,6 @@ padding-left:10px;
     
 }
 
-.zdef li {list-style-type: none;
-        margin-left: 10px;
-}
   
 .closebtn{
 	float: right;
@@ -945,12 +937,12 @@ padding-left:10px;
     
 .formwidth {width: 100%;}
 .button {
-    border: 3px solid #E1E8E8;
-    background: #E1E8E8;
+    border: 3px solid #E1E8E8;background: #E1E8E8;
 }
 .button:hover {
     border: 3px solid #C1CACB;
     background: #C1CACB;
+    
 }
 
 label {
@@ -958,8 +950,11 @@ label {
     text-align: left;
 }
 
+
+
 .progbar{
-   
+         float: left;
+        font-size: 1.3em;
 	height: 18px;
 	margin-bottom: 18px;
 	overflow: hidden;
@@ -988,8 +983,32 @@ label {
 }
 
 
-.betaclose a {float:right;
-           margin-right:30px;}
+.betabox {
+        height:100%;
+        width:100%;
+        background-color:#fff;
+}
+.betabox2 {
+        width:100%;
+        padding:10px;
+        background-color:#FFC10E;
+        text-align:left;
+        letter-spacing: 1px;
+}
+.betabox3 { 
+    padding:20px;
+}
+.betax {
+        font-size: 1em;
+        float:right;
+        margin-right:20px;
+        border:none;
+        cursor:pointer;
+        background-color:#FFC10E;
+      
+}
+
+
 
 
 #tag {
@@ -1006,6 +1025,9 @@ body .gform_wrapper .description,
 .gform_wrapper .instruction  { font-family: 'FuturaTEST', Verdana, Arial, Sans-Serif !important;}
 
 
+    
+
+
 /* "Daisy, Daisy, give me your answer do. I'm half crazy all for the love of you.
 	It won't be a stylish marriage, I can't afford a carriage.
 	But you'll look sweet upon the seat of a bicycle built for two." */