sostler prod commit

19 files changed, 863 insertions, 567 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index e5c22de..9c8b945 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -88,7 +88,7 @@ bottom:76;
 	position:fixed;
 	width:100%;
 	bottom:-8px;
-line-height:3.1;
+line-height:1.6;
 	font-size:11px;
 word-spacing:6px;
 height:28px;
@@ -117,7 +117,7 @@ top:50px;
 bottom:65px;
 	position:fixed;
 	width: 99.6%;
-	background-color:#FFF;
+	background-color:#fff;
 left:0.2%;
 	z-index:5;
 }
@@ -189,6 +189,25 @@ border-right:0px;
 	font-size:12px;
 	color:#000;
 }
+#prevbutton {		
+	position:absolute;
+	display:inline-block;
+	width:120px;
+height:35px;
+background-position:center;
+right:125px;
+top:0;
+font-weight:bold;
+background-color:#eff5fb;
+padding-bottom:1;
+	text-align:center;
+	z-index:100;
+	cursor:pointer;
+	font-size:12px;
+	color:#000;
+border:1px solid #000;border-right:0px;
+}
+
 #webcam-button-upload{
 		border-top-right-radius:10px;
 	-webkit-border-top-right-radius:5px;background-color:#eff5fb;
@@ -211,6 +230,29 @@ padding-bottom:1;
 	font-size:12px;
 	color:#000;
 }
+#nextbutton{
+		border-top-right-radius:10px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
+	position:absolute;
+	display:inline-block;
+	width:120px;
+height:35px;
+font-weight:bold;
+background-position:center;
+right:5px;background-color:#eff5fb;
+border:1px solid #000;
+top:0;
+padding-bottom:1;
+	text-align:center;
+	z-index:100;
+	cursor:pointer;
+	font-size:12px;
+	color:#000;
+}
 #webcam-button-snap{
 		border-top-right-radius:10px;
 	-webkit-border-top-right-radius:5px;
@@ -416,7 +458,7 @@ border:1px solid blue;
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
-	background-color:#FFF;
+	background-color:#transparent;
 	-webkit-border-top-right-radius:5px;
 	-moz-border-radius-topleft:5px;
 	-moz-border-radius-topright:5px;
@@ -434,9 +476,11 @@ border-bottom:2px solid #c8cbce;
 -moz-box-shadow: 3px 3px 4px #c8cbce;
 filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true);
 	text-overflow:ellipsis;
-/* opacity:0.87; */
+/* opacity:0.75;*/
 	z-index:18;
 	text-align: left;
+background-image:url(/static/img/bg.dither.gif);
+
 }
 #userList a:hover{color:#ffffff;}
 .username{height:30px;
@@ -453,8 +497,26 @@ display:block;
 width:100%; 
 height:100%; color:#000;
 text-decoration:none; 
+
 }  
 .username a:hover { 
+text-shadow: none;
+display:block; 
+width:100%;
+height:100%;
+background-image:url(/static/img/moverc.png);
+background-repeat:repeat-x;
+color:#fff;
+text-decoration:none;
+background-color:#f3f3f3;
+	border-top-right-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
+}  
+#userlist a:hover { 
 display:block; 
 width:100%;
 height:100%;
@@ -524,6 +586,89 @@ background-color:#f3f3f3;
 	width:auto;
 	
 }
+#userListp {
+	overflow-x: hidden;
+	overflow-y:auto;
+	max-height: 70%;
+	margin: 0px;
+	position: absolute;
+	padding: 5px;
+	top:25px;
+	min-width: 210px;
+	width:11%;
+	float:right;
+	right: 4.5%;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight:420;
+	border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	background-color:#transparent;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-left-radius:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+	-moz-border-radius-bottomright:5px;
+border-right:2px solid #c8cbce;
+border-bottom:2px solid #c8cbce;
+
+		box-shadow: 3px 4px 4px #c8cbce;
+-webkit-box-shadow: 3px 4px 4px #c8cbce;
+-moz-box-shadow: 3px 3px 4px #c8cbce;
+filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true);
+	text-overflow:ellipsis;
+/* opacity:0.75;*/
+	z-index:18;
+	text-align: left;
+background-image:url(/static/img/bg.dither.gif);
+background-color:#fff;
+
+}
+#userListp img{
+
+    max-width:30px;
+    width: expression(this.width > 30 ? 30: true);
+    max-height:30px;
+    height: expression(this.width > 30 ? 30: true);
+    max-width:30px;
+	float:right;
+	right:1px;
+	z-index:77;
+	height:30px;
+	border-top-left-radius:3px;
+	border-top-right-radius:3px;
+	-webkit-border-top-left-radius:3px;
+	-webkit-border-top-right-radius:3px;
+	-moz-border-radius-topleft:3px;
+	-moz-border-radius-topright:3px;
+	border-bottom-left-radius:3px;
+	border-bottom-right-radius:3px;
+	-webkit-border-bottom-left-radius:3px;
+	-webkit-border-bottom-right-radius:3px;
+	-moz-border-radius-bottomleft:3px;
+	-moz-border-radius-bottomright:3px;
+}
+#userlistp a:hover { 
+display:block; 
+width:100%;
+height:100%;
+background-image:url(/static/img/moverc.png);
+background-repeat:repeat-x;
+color:#fff;
+text-decoration:none;
+background-color:#f3f3f3;
+	border-top-right-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
+}  
 #mgsavatar{
 left:0;
 }
@@ -587,6 +732,15 @@ overflow:auto !important;
 #chatrap{
 
 }
+#messagePanep {
+top:50px;
+bottom:65px;
+	position:fixed;
+	width: 99.6%;
+	background-color:#fff;
+left:0.2%;
+	z-index:5;
+}
     #edit-toggle{
 position:absolute;
 top:0;
@@ -783,6 +937,10 @@ background-color:#fff;
 	-moz-border-radius-bottomright:5px;
 
 }
+#profiletxt img{
+width:16px;
+height:16px;
+}
 #pnav a {
 	font-size: 30px;
 	color:#000;
@@ -838,25 +996,34 @@ color:000;
 }
 
 .logged-dump img{
-    max-width:600px;
+    max-width:400px;
     width: expression(this.width > 600 ? 600: true);
-    max-height:600px;
+    max-height:400px;
+    height: expression(this.width > 600 ? 600: true);
+	border:0px;
+	z-index:4;	
+}
+#messageList img{
+    max-width:400px;
+    width: expression(this.width > 600 ? 600: true);
+    max-height:400px;
     height: expression(this.width > 600 ? 600: true);
 	border:0px;
 	z-index:4;	
 }
 .logged-dump{ 
-width:600px;
-    max-width:600px;
+
+background-color:#f0f9ff;
 text-overflow: ellipsis-word;
 	padding: 18px 18px 6px 18px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	text-transform: uppercase;
+
+margin-left:3px;
 	line-height:15px;
-	background-color:#fff;
-border-top:0px solid #000;	
-margin-top:20;
+border-top:1px solid #ccc;	
+
 	z-index:4;
 	line-height:20px;
 	text-align: left;
@@ -956,7 +1123,9 @@ z-index:5555;
   
 }
 .dlogged-dump{ 
-    width:600px;
+    min-width:600px;
+    max-width:600px;
+width:600px;
     width:auto;
 text-overflow: ellipsis-word;
 	padding: 18px;
diff --git a/static/css/header.css b/static/css/header.css
index 493f4d4..fd189f1 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -14,8 +14,8 @@
 	margin: 0px auto -1px auto;
 	top:-1px;
 height:49px;
-	position:fixed;
-background-color:#fff;
+	position:fixed;background-image:url(/static/img/bg.dither.gif);
+background-color:#eee;
 border:1px solid #000;
 width:100%;
 min-width:600px;
@@ -85,6 +85,11 @@ background-color:#eff5fb;
 #logout7 a:hover{font-size:10px;
 color:#000;	text-shadow: 0px 1px 0px #fff;
 }
+#toplogin{
+margin-top:8px;
+margin-right:5px;
+
+}
 
 .white a:link {
  text-decoration: none;
@@ -140,17 +145,16 @@ border-left:1px solid #999;*/
 width:auto;
 }
 #registerlink{
-	top:-5px;
 	font-size: 16px;
-height:22;
 word-spacing:2;
-color:#fff;
-
+line-height:2.4;
+font-weight:bold;
 }
 
 #registerlink img{
 display:none;
 }
+
 .no-cursor { cursor: none; }
 .invisible { display: none !important; }
 #cursor-big { position: absolute; z-index: 1000; }
@@ -187,6 +191,7 @@ img.chat-thumb {
 .buttons{
   cursor:pointer;
 
+
 }
 .buttons .share {
   opacity: 0.8;
@@ -204,10 +209,11 @@ image-rendering: -moz-crisp-edges;
   margin-top: 0px;
   height: 27px;
   width: 27px;
-  right: 5px;
-  top: 3px;
+  left:110px;
+  bottom: 9px;
   display: block;
 }
+
 .thumb.favorite {
   position: absolute;
   margin-left: 0px;
diff --git a/static/form_login/front.css b/static/form_login/front.css
index 7b662d6..05d23ac 100644
--- a/static/form_login/front.css
+++ b/static/form_login/front.css
@@ -100,10 +100,8 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4,
 
 #signin_menu input[type=text], #signin_menu input[type=password] {
 	display:block;
-	-moz-border-radius:4px;
-	-webkit-border-radius:4px;
-	font-size:13px;
-	margin:0 0 5px;border:1px solid;
+	font-size:25px;
+	margin:0 0 5px;
 	padding:5px;
 	width:203px;
 }
@@ -123,9 +121,8 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4,
 #signin-submitform {
 	display:inline-block;
 	width:90px;
-  height:30px;
+  height:35px;
   font-size:20px;
-border:1px solid #999;
   background-image:url(/static/img/btngrad1.png);
   font-weight:bold;
   word-spacing:7;
diff --git a/static/furieindex.html b/static/furieindex.html
new file mode 100755
index 0000000..bcf44c9
--- /dev/null
+++ b/static/furieindex.html
@@ -0,0 +1,150 @@
+<!--/*
+
+     _____          ___           ___           ___         ___         ___     
+    /  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
+   /  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
+  /  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
+ /__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
+ \  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
+  \  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
+   \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
+    \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
+     \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
+                   \__\/         \__\/         \__\/       \__\/       \__\/    
+
+(c)2010 dump.fm -->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <title>dump.fm</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
+    <META NAME="description" CONTENT="Talk with pictures!">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/js/sha1.js"></script>
+    <script type="text/javascript" src="/static/js/home.js"></script>
+    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <script>
+      $(document).ready(initLoginForm);
+    </script>
+<script type="text/javascript">
+jQuery(window).load(function() {
+	jQuery('#slider').nivoSlider({
+		effect:'random',
+		slices:15,
+		animSpeed:500,
+		pauseTime:5000,
+		startSlide:0, //Set starting Slide (0 index)
+		directionNav:false, //Next & Prev
+		directionNavHide:false, //Only show on hover
+		controlNav:false, //1,2,3...
+		controlNavThumbs:false, //Use thumbnails for Control Nav
+		controlNavThumbsSearch: '.jpg', //Replace this with...
+		controlNavThumbsReplace: '_thumb.jpg', //...this in thumb Image src
+		keyboardNav:false, //Use left & right arrows
+		pauseOnHover:false, //Stop animation while hovering
+		manualAdvance:false, //Force manual transitions
+		captionOpacity:0.8, //Universal caption opacity
+		beforeChange: function(){},
+		afterChange: function(){},
+		slideshowEnd: function(){} //Triggers after all slides have been shown
+	});
+});
+</script>
+<script type="text/javascript">
+$(document).ready(function() {
+	jQuery(".btn-slide").click(function() {
+		jQuery("#panel").slideToggle("slow");
+		jQuery(this).toggleClass("active"); return false;
+	});
+});
+</script>
+
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/reset.css">  
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css">  
+<link rel="stylesheet" href="static/css/nivo-slider.css" type="text/css" media="screen" />
+<link rel="shortcut icon" href="static/favicon.ico">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>dump.fm</title></head>
+</head>
+<body>
+
+<div id="panel">
+<center><object width="460" height="345"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;autoplay=1&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;autoplay=1&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="460" height="345"></embed></object></center>
+</div>
+
+<p class="slide"><a href="#" class="btn-slide">watch a lil movie</a>
+<div id="rapper"></div><div id="idgi"></div>
+<div id="content" style="z-index:77;">
+
+<div id="main" align="center">
+  
+  <img src="/static/img/flyhorse.gif" id="horse" />
+<img src="/static/img/bigbow.png" id="bigbow" />
+  <div id="registerbox">
+    <div id="logo-and-text">
+      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
+        <div align="center">
+        <a href="/register" style="text-decoration:none;">Click here to Register!</a> <br>
+        </div>
+      </div>
+    </div>
+    <input type="text" id="nickInput" size="17" /><br>
+    <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+    <input type="password" id="passwordInput" size="17" /><br />
+
+    <input id="signin-submit" value="Sign In" />
+    <div id="remember"><label>
+        <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+        Remember Me
+    </label>
+  <br>
+  <a href="/reset-request">Lost password?</a><br>
+</div>
+  <img src="/static/img/furie1.png" id="furie1" />
+  <img src="/static/img/furie2.png" id="furie2" />
+  </div>
+
+</div>
+
+<div id="info">
+
+ <br>
+ <div id="talkaboutus">
+<div id="slider" style="display:none;">
+ <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
+ <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
+ </div>
+
+ <div id="footer" style="text-align: center">
+@2010 <a href="/">dump.fm</a>
+<a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
+<a href="/terms">Terms</a>
+<a href="/privacy">Privacy</a></div>
+</div> 
+<br><br>
+</div>
+</div>
+<div id="preload">
+  <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+</div>
+
+
+      <div id="preload">
+        <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+      </div>
+
+      <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+        try {
+        var pageTracker = _gat._getTracker("UA-12364576-1");
+        pageTracker._trackPageview();
+        } catch(err) {}
+      </script>
+  </body>
+</html>
diff --git a/static/img/bg.dither.gif b/static/img/bg.dither.gif
new file mode 100644
index 0000000..670df08
--- /dev/null
+++ b/static/img/bg.dither.gif
diff --git a/static/img/dumppixelhover.png b/static/img/dumppixelhover.png
new file mode 100644
index 0000000..77f18a8
--- /dev/null
+++ b/static/img/dumppixelhover.png
diff --git a/static/img/link.gif b/static/img/link.gif
new file mode 100644
index 0000000..9cc8784
--- /dev/null
+++ b/static/img/link.gif
diff --git a/static/img/previewdump.png b/static/img/previewdump.png
new file mode 100644
index 0000000..7d0d526
--- /dev/null
+++ b/static/img/previewdump.png
diff --git a/static/index.html b/static/index.html
index bcf44c9..a62c761 100755..100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,31 +1,14 @@
-<!--/*
-
-     _____          ___           ___           ___         ___         ___     
-    /  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
-   /  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
-  /  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
- /__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
- \  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
-  \  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
-   \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
-    \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
-     \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
-                   \__\/         \__\/         \__\/       \__\/       \__\/    
-
-(c)2010 dump.fm -->
-
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
-  <head>
-    <title>dump.fm</title>
+<head>
+ <title>dump.fm</title>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
     <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
     <META NAME="description" CONTENT="Talk with pictures!">
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
     <script type="text/javascript" src="/static/js/sha1.js"></script>
     <script type="text/javascript" src="/static/js/home.js"></script>
-    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <link rel="shortcut icon" href="/static/favicon.ico">
+	<script src="/static/js/loopedslider.js" type="text/javascript" charset="utf-8"></script>
     <script>
       $(document).ready(initLoginForm);
     </script>
@@ -53,49 +36,281 @@ jQuery(window).load(function() {
 	});
 });
 </script>
-<script type="text/javascript">
-$(document).ready(function() {
-	jQuery(".btn-slide").click(function() {
-		jQuery("#panel").slideToggle("slow");
-		jQuery(this).toggleClass("active"); return false;
-	});
-});
-</script>
+<style>
+
+
+body{margin:0px;
+background-color:#fff;
+	font-family:Arial, Helvetica, sans-serif;	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+}
+A:link {text-decoration: none}
+A:visited {text-decoration: none}
+A:active {text-decoration: none}
+#rapper{
+width:800px;
+	margin: 0 auto 0 auto;
+
+background-position:top center;
+	background-repeat:no-repeat;
+	box-shadow: 0 0 10px #000;
+  -webkit-box-shadow: 0 0 10px #000;
+  -moz-box-shadow: 0 0 10px #000;
+}
+#toplogo{
+top:0px;
+width:800px;
+background-image:url(/static/img/blue2fade.png);
+}
+#bottomcontainer{
+width:800px;
+
+}
+#signin{
+background-color:#eff5fb;
+float:right;
+width:201px;
+height:225px;
+top:0px;
+padding:15px;
+padding-top:10px;
+font-size:10px;
+text-indent:5px;
+border:1px solid #000;border-right:0px solid #000;
+
+}
+#membertxt{
+background-color:#fff;
+padding:5px;
+border:1px solid black;
+margin-top:-22px;
+z-index:5;
+width:100;
+}
+
+#wtftxt{
+background-color:#fff;
+padding:5px;
+padding-left:15px;
+padding-right:15px;
+font-size:24px;
+border:1px solid black;
+margin-top:-56px;
+z-index:5;
+float:left;
+background-image:url(/static/img/ylgrad.png);
+}
+#previewdump{
+background-color:#fff;
+padding:5px;
+padding-left:15px;
+padding-right:15px;
+font-size:16px;
+border:1px solid #ccc;
+margin-top:-300px;
+z-index:5;
+float:right;
+margin-right:-210px;
+	border-bottom-left-radius:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+	-moz-border-radius-bottomright:5px;
+background-image:url(/static/img/grgrad.png);
+}
+#previewdump a:hover{
+color:#000000;
+}
+input {
+	height:40px;
+	width:190px;
+float:right;
+padding-left:2px;
+	border:0px;
+border:1px solid #000;
+	margin:5px;
+	color:#000;z-index:20;
+	font-size:20px;
+	
+}
+.no-cursor { cursor: none; }
+.invisible { display: none !important; }
+#cursor-big { position: absolute; z-index: 1000; }
+
+label {
+ display:inline-block;
+ font-size: 13px;
+ color: #222;
+float:right;
+margin-bottom:4px;
+}
+#signin-submit {
+	display:inline-block;
+
+  height:33px;float:left;
+  font-size:20px;
+width:190px;
+  font-weight:bold;
+  word-spacing:7;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#000;
+float:right;
+border:1px solid #000;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+
+z-index:20;
+}
+#remember{
+float:right;padding-top:5px;
+top:0px;display:block;
+margin-right:5px;
+}
+#remember a{text-decoration:none;font-size:11px;float:right;}
+#remembermeInput {
+ width: 15px;
+ height: 15px;
+ margin: 1px;
+}
+#wtf{
+float:left;
+width:538px;
+position:absolute;
+border:1px solid #000;
+border-left:0px solid #000;
+padding:15px;
+height:220px;
+background-color:#eff5fb;
+}
+#toptxt{
+padding:10px;
+text-align:center;
+}
+#lilflag{
+background-image:url(/static/img/lilflag.png);
+width: 173px; height: 59px;
+top:15px;
+padding-left:20px;
+position:absolute;
+color:#fff;
+padding-top:1px;
+text-align:left;
+word-spacing:8px;padding-right:10px;
+font-size:19px;
+margin-left:-13px;text-decoration:none;
+}
+#lilflag a:link {
+text-decoration:none;
+}
+#footer{
+padding-bottom:5px;
+padding-top:15px;
+text-align: center;
+color:#000;
+font-size:11px;
+word-spacing:30px;
+	margin: 0 auto 0 auto;
+background-color:#eff5fb;
+margin-top:250px;
+width:798px;
+}
+#bottomrow img{
+background-image:url(/static/img/grgrad.png);
+	border-radius: 15px;
+border:5px solid #ccc;
+padding:5px;
+	-webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+}
+#footer a{color:#000;text-decoration:none;}
+
+
+
+	/*
+		 * Required 
+		*/
+		.container { margin-top:8px;border:01px solid #666;width:538px; height:205px; overflow:hidden; position:relative; cursor:pointer; }
+		.slides { position:absolute; top:0; left:0; }
+		.slides div { position:absolute; top:0; width:538px; display:none; }
+		/*
+		 * Optional
+		*/
 
-<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/reset.css">  
-<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css">  
-<link rel="stylesheet" href="static/css/nivo-slider.css" type="text/css" media="screen" />
-<link rel="shortcut icon" href="static/favicon.ico">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>dump.fm</title></head>
+		blockquote, q { quotes: none; }
+		:focus { outline: 0; }
+		ins { text-decoration: none; }
+		del { text-decoration: line-through; }
+		table { border-collapse: collapse; border-spacing: 0; }
+		#loopedSlider {width:610px; position:relative; clear:both; }
+		ul.pagination { list-style-type:none; margin:0; padding:0; margin:9px auto; width:132px; }
+		ul.pagination li { float:left; margin:0 5px;display:none; }	
+		ul.pagination a { display:block; width:12px; padding-top:12px; height:0; overflow:hidden; background-image:url(/static/img/pagination.png); background-position:0 0; background-repeat:no-repeat;}
+
+
+</style>
 </head>
 <body>
 
-<div id="panel">
-<center><object width="460" height="345"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;autoplay=1&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;autoplay=1&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="460" height="345"></embed></object></center>
+<div id="rapper">
+<div id="toplogo">
+<img src="/static/img/dumppixellarge.png">
+<div id="lilflag">
+HOME OF THE SLOTHGOTH!!!!!
+</div>
 </div>
 
-<p class="slide"><a href="#" class="btn-slide">watch a lil movie</a>
-<div id="rapper"></div><div id="idgi"></div>
-<div id="content" style="z-index:77;">
+<div id="bottomcontainer">
+<div id="wtf">
+<a href="/register"><div id="wtftxt">
+Click here to Register!
+</div>
+<a href="/chat"><div id="previewdump">
+preview dump.fm!
+</div>
+</a>
+<div id="loopedSlider">	
+	<div class="container">
+		<div style="width: 2152px; left: 0px;" class="slides">
+			<div style="position: absolute; left: 0px; display: block;"><img 
+src="/static/img/slide1.png" alt="dump.fm" width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 538px; display: block;"><img 
+src="/static/img/slide2.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 1076px; display: block;"><img 
+src="/static/img/slide3.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 1614px; display: block;"><img 
+src="/static/img/slide4.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+		</div>
+	</div>
+	
+	<ul class="pagination">
+		<li class=" "><a rel="1" href="#">1</a></li>
+		<li class=" "><a rel="2" href="#">2</a></li>
+		<li class=" "><a rel="3" href="#">3</a></li>
+		<li class="  active"><a rel="4" href="#">4</a></li>
+	</ul>	
+</div>
+<script type="text/javascript" charset="utf-8">
+	jQuery(function(){
+		jQuery('#loopedSlider').loopedSlider();
+	});
+</script>
 
-<div id="main" align="center">
-  
-  <img src="/static/img/flyhorse.gif" id="horse" />
-<img src="/static/img/bigbow.png" id="bigbow" />
-  <div id="registerbox">
-    <div id="logo-and-text">
-      <a href="/"><img src="/static/img/dumpclearlogo2.png"></a>
-        <div align="center">
-        <a href="/register" style="text-decoration:none;">Click here to Register!</a> <br>
-        </div>
-      </div>
-    </div>
-    <input type="text" id="nickInput" size="17" /><br>
+</div>
+
+<div id="signin">
+<div id="membertxt">Already a member?</div><br><br>
+ <input type="text" id="nickInput" size="17" /><br>
     <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
     <input type="password" id="passwordInput" size="17" /><br />
 
-    <input id="signin-submit" value="Sign In" />
+    <input id="signin-submit" value="Sign In!" />
     <div id="remember"><label>
         <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
         Remember Me
@@ -103,33 +318,14 @@ $(document).ready(function() {
   <br>
   <a href="/reset-request">Lost password?</a><br>
 </div>
-  <img src="/static/img/furie1.png" id="furie1" />
-  <img src="/static/img/furie2.png" id="furie2" />
-  </div>
-
 </div>
-
-<div id="info">
-
- <br>
- <div id="talkaboutus">
-<div id="slider" style="display:none;">
- <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
- <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
- </div>
-
- <div id="footer" style="text-align: center">
+</div>
+ <div id="footer">
 @2010 <a href="/">dump.fm</a>
 <a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
 <a href="/terms">Terms</a>
 <a href="/privacy">Privacy</a></div>
 </div> 
-<br><br>
-</div>
-</div>
-<div id="preload">
-  <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
-</div>
 
 
       <div id="preload">
@@ -146,5 +342,5 @@ $(document).ready(function() {
         pageTracker._trackPageview();
         } catch(err) {}
       </script>
-  </body>
+</body>
 </html>
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index e23906f..c7788cd 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -71,6 +71,7 @@ var InvalidDomains = [
     "http://www.oafe.net",
     "http://www.mrbalihai.com",
     "http://www.digyourowngrave.com",
+    "http://tripod.com",
     "http://www.kaitaia.com",
     "http://carsdriveingallery.com",
     "http://xxxspacegirls.us",
diff --git a/static/js/pichat.js b/static/js/pichat.js
index f130239..48b5e54 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -22,7 +22,7 @@ Anim = {
     "chatThumbTiny": {"width": "8px", "height": "8px", "right": "8px", "bottom": "8px"},
     "chatThumb": {"width": "16px", "height": "16px", "right": "4px", "bottom": "4px"},
     "logThumb": {"width": "27px", "height": "27px", "marginRight": "0px", "marginTop": "0px"},
-    "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-20px", "marginTop": "-20px"}
+    "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-2px", "marginTop": "-2px"}
 }
 
 // Utils
@@ -1014,4 +1014,4 @@ function startTitleUpdater() {
 
 $(function() {
     OrigTitle = $('title').text();
-});
\ No newline at end of file
+});
diff --git a/static/newindex.html b/static/newindex.html
deleted file mode 100644
index e06d8f7..0000000
--- a/static/newindex.html
+++ /dev/null
@@ -1,329 +0,0 @@
-<html>
-<head>
- <title>dump.fm</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
-    <META NAME="description" CONTENT="Talk with pictures!">
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-    <script type="text/javascript" src="/static/js/sha1.js"></script>
-    <script type="text/javascript" src="/static/js/home.js"></script>
-    <link rel="shortcut icon" href="/static/favicon.ico">
-	<script src="/static/js/loopedslider.js" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
-    <link rel="stylesheet" href="/static/css/nivo-slider.css" type="text/css" media="screen" />
-    <script>
-      $(document).ready(initLoginForm);
-    </script>
-<script type="text/javascript">
-jQuery(window).load(function() {
-	jQuery('#slider').nivoSlider({
-		effect:'random',
-		slices:15,
-		animSpeed:500,
-		pauseTime:5000,
-		startSlide:0, //Set starting Slide (0 index)
-		directionNav:false, //Next & Prev
-		directionNavHide:false, //Only show on hover
-		controlNav:false, //1,2,3...
-		controlNavThumbs:false, //Use thumbnails for Control Nav
-		controlNavThumbsSearch: '.jpg', //Replace this with...
-		controlNavThumbsReplace: '_thumb.jpg', //...this in thumb Image src
-		keyboardNav:false, //Use left & right arrows
-		pauseOnHover:false, //Stop animation while hovering
-		manualAdvance:false, //Force manual transitions
-		captionOpacity:0.8, //Universal caption opacity
-		beforeChange: function(){},
-		afterChange: function(){},
-		slideshowEnd: function(){} //Triggers after all slides have been shown
-	});
-});
-</script>
-<style>
-
-
-
-
-
-
-
-
-
-
-body{margin:0px;
-background-color:#fff;
-	font-family:Arial, Helvetica, sans-serif;	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
-}
-A:link {text-decoration: none}
-A:visited {text-decoration: none}
-A:active {text-decoration: none}
-#rapper{
-width:800px;
-	margin: 0 auto 0 auto;
-
-background-position:top center;
-	background-repeat:no-repeat;
-	box-shadow: 0 0 10px #000;
-  -webkit-box-shadow: 0 0 10px #000;
-  -moz-box-shadow: 0 0 10px #000;
-}
-#toplogo{
-top:0px;
-width:800px;
-background-image:url(/static/img/blue2fade.png);
-}
-#bottomcontainer{
-width:800px;
-
-}
-#signin{
-background-color:#eff5fb;
-float:right;
-width:201px;
-height:225px;
-top:0px;
-padding:15px;
-padding-top:10px;
-font-size:10px;
-text-indent:5px;
-border:1px solid #000;border-right:0px solid #000;
-
-}
-#membertxt{
-background-color:#fff;
-padding:5px;
-border:1px solid black;
-margin-top:-22px;
-z-index:5;
-width:100;
-}
-
-#wtftxt{
-background-color:#fff;
-padding:5px;
-padding-left:15px;
-padding-right:15px;
-font-size:24px;
-border:1px solid black;
-margin-top:-56px;
-z-index:5;
-float:left;
-background-image:url(/static/img/ylgrad.png);
-}
-
-input {
-	height:40px;
-	width:190px;
-float:right;
-padding-left:2px;
-	border:0px;
-border:1px solid #000;
-	margin:5px;
-	color:#000;z-index:20;
-	font-size:20px;
-	
-}
-.no-cursor { cursor: none; }
-.invisible { display: none !important; }
-#cursor-big { position: absolute; z-index: 1000; }
-
-label {
- display:inline-block;
- font-size: 13px;
- color: #222;
-float:right;
-margin-bottom:4px;
-}
-#signin-submit {
-	display:inline-block;
-
-  height:33px;float:left;
-  font-size:20px;
-width:190px;
-  font-weight:bold;
-  word-spacing:7;
-	text-align:center;
-	z-index:100;
-	font-size:16px;
-	color:#000;
-float:right;
-border:1px solid #000;
-	border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-
-z-index:20;
-}
-#remember{
-float:right;padding-top:5px;
-top:0px;display:block;
-margin-right:5px;
-}
-#remember a{text-decoration:none;font-size:11px;float:right;}
-#remembermeInput {
- width: 15px;
- height: 15px;
- margin: 1px;
-}
-#wtf{
-float:left;
-width:538px;
-position:absolute;
-border:1px solid #000;
-border-left:0px solid #000;
-padding:15px;
-height:220px;
-background-color:#eff5fb;
-}
-#toptxt{
-padding:10px;
-text-align:center;
-}
-#lilflag{
-background-image:url(/static/img/lilflag.png);
-width: 173px; height: 59px;
-top:15px;
-padding-left:20px;
-position:absolute;
-color:#fff;
-padding-top:1px;
-text-align:left;
-word-spacing:8px;padding-right:10px;
-font-size:19px;
-margin-left:-13px;text-decoration:none;
-}
-#lilflag a:link {
-text-decoration:none;
-}
-#footer{
-padding-top:15px;
-padding-bottom:5px;
-text-align: center;
-color:#000;
-font-size:11px;
-word-spacing:30px;
-	margin: 0 auto 0 auto;
-background-color:#eff5fb;
-margin-top:250px;
-width:798px;
-}
-#footer a{color:#000;text-decoration:none;}
-
-
-
-	/*
-		 * Required 
-		*/
-		.container { margin-top:8px;border:01px solid #666;width:538px; height:205px; overflow:hidden; position:relative; cursor:pointer; }
-		.slides { position:absolute; top:0; left:0; }
-		.slides div { position:absolute; top:0; width:538px; display:none; }
-		/*
-		 * Optional
-		*/
-
-		blockquote, q { quotes: none; }
-		:focus { outline: 0; }
-		ins { text-decoration: none; }
-		del { text-decoration: line-through; }
-		table { border-collapse: collapse; border-spacing: 0; }
-		#loopedSlider {width:610px; position:relative; clear:both; }
-		ul.pagination { list-style-type:none; margin:0; padding:0; margin:9px auto; width:132px; }
-		ul.pagination li { float:left; margin:0 5px;display:none; }	
-		ul.pagination a { display:block; width:12px; padding-top:12px; height:0; overflow:hidden; background-image:url(/static/img/pagination.png); background-position:0 0; background-repeat:no-repeat;}
-
-
-
-
-
-</style>
-</head>
-<body>
-
-<div id="rapper">
-<div id="toplogo">
-<img src="/static/img/dumppixellarge.png">
-<a href="/static/slowthgoth.html">
-<div id="lilflag">
-HOME OF THE SLOTHGOTH!!!!!
-</div>
-</a>
-</div>
-
-<div id="bottomcontainer">
-<div id="wtf">
-<a href="/register"><div id="wtftxt">
-Click here to Register!
-</div>
-</a>
-<div id="loopedSlider">	
-	<div class="container">
-		<div style="width: 2152px; left: 0px;" class="slides">
-			<div style="position: absolute; left: 0px; display: block;"><img 
-src="/static/img/slide1.png" alt="dump.fm" width="538px" 
-height="205"></div>
-			<div style="position: absolute; left: 538px; display: block;"><img 
-src="/static/img/slide2.png" alt="dump.fm"  width="538px" 
-height="205"></div>
-			<div style="position: absolute; left: 1076px; display: block;"><img 
-src="/static/img/slide3.png" alt="dump.fm"  width="538px" 
-height="205"></div>
-			<div style="position: absolute; left: 1614px; display: block;"><img 
-src="/static/img/slide4.png" alt="dump.fm"  width="538px" 
-height="205"></div>
-		</div>
-	</div>
-	
-	<ul class="pagination">
-		<li class=" "><a rel="1" href="#">1</a></li>
-		<li class=" "><a rel="2" href="#">2</a></li>
-		<li class=" "><a rel="3" href="#">3</a></li>
-		<li class="  active"><a rel="4" href="#">4</a></li>
-	</ul>	
-</div>
-<script type="text/javascript" charset="utf-8">
-	jQuery(function(){
-		jQuery('#loopedSlider').loopedSlider();
-	});
-</script>
-
-</div>
-
-<div id="signin">
-<div id="membertxt">Already a member?</div><br><br>
- <input type="text" id="nickInput" size="17" /><br>
-    <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
-    <input type="password" id="passwordInput" size="17" /><br />
-
-    <input id="signin-submit" value="Sign In!" />
-    <div id="remember"><label>
-        <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
-        Remember Me
-    </label>
-  <br>
-  <a href="/reset-request">Lost password?</a><br>
-</div>
-</div>
-</div>
- <div id="footer">
-@2010 <a href="/">dump.fm</a>
-<a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
-<a href="/terms">Terms</a>
-<a href="/privacy">Privacy</a></div>
-</div> 
-
-
-      <div id="preload">
-        <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
-      </div>
-
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-        try {
-        var pageTracker = _gat._getTracker("UA-12364576-1");
-        pageTracker._trackPageview();
-        } catch(err) {}
-      </script>
-</body>
-</html>
diff --git a/template/banner.st b/template/banner.st
index 9ee037a..3339fc2 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -2,7 +2,25 @@
   <div id="header7">
   <div id="logoicons">
     <div id="logo7">
-  <div align="center"><a href="http://dump.fm"><img src="/static/img/dumppixel.png"></a></div>
+  <div align="center">
+  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 /><style type='text/css'>
+a.img_roll:link, .img_roll{
+	width:130px;
+	height:46px;
+	display:block;
+	background-image:url(http://dump.fm/static/img/dumppixel.png);
+}
+a.img_roll:hover{
+	width:130px;
+	height:46px;
+	display:block;
+	background-image:url(http://dump.fm/static/img/dumppixelhover.png);
+}
+</style>
+<a class="img_roll" href="http://dump.fm/"></a>
+
+  
+  </div>
     </div>
     <div class="white">
       
@@ -20,7 +38,7 @@
 	    $else$
   
 
-<a href="/register" id="registerlink"><img src="/static/img/ako.gif"width="21px" height="21px" /> dump.fm lets you share pictures in real-time. Click here to get started!</a>
+<a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a>
    
 	    $endif$     
 
@@ -32,7 +50,7 @@
 
     
     <div id="topic"></div>
-       <div id="dumplist"> dump.fm - let pictures do the talking -  <a href="http://dump.fm/$user_nick$/favorites">my favorite pics</a> -<a href="http://bieber.dump.fm"> - justin bieber </a>$if(isadmin)$ 
+       <div id="dumplist"> dump.fm - let pictures do the talking $if(user_nick)$-  <a href="http://dump.fm/$user_nick$/favorites">my favorite pics</a> -<a href="http://bieber.dump.fm"> - justin bieber </a>$endif$ $if(isadmin)$ 
     <a href="http://news.dump.fm">- news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
 
 
@@ -41,7 +59,7 @@
       </div>
 $if(user_nick)$
           <div id="logout7" class="white">   
-      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="logout7" class="white">   $form_login()$</div> $endif$
+      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="toplogin" class="white">   $form_login()$</div> $endif$
 
       
     </div>
diff --git a/template/nigga.st b/template/nigga.st
new file mode 100644
index 0000000..4a8ff02
--- /dev/null
+++ b/template/nigga.st
@@ -0,0 +1,135 @@
+<html>
+  <head>
+    <title>$nick$'s dump.fm</title>
+    $head()$
+    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css">
+    <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
+    <script src="/static/js/ajaxupload.js"></script>
+    <script>
+      jQuery(document).ready(initProfile);
+    </script> 
+      <style>
+    #chat-wrapper {
+        position: absolute;
+        z-index: 1000000;
+        right: 100px;
+        bottom: 100px;
+       height: 40px;
+       width: 300px;
+    };
+  </style>
+  </head>
+  <body class="profile">
+    $banner()$
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
+        </div>
+  
+        <div id="messagePane">
+          <div id="userList"><br>
+               <h2>   <br><br>
+                    $if(avatar)$
+               <img id="avatarPic" src="$avatar$"/>
+                $else$<br><br>
+              <img id="avatarPic" src="/static/img/noinfo.png">
+              $endif$
+               
+               $nick$               </h2><br>
+              $if(score_ent)$
+              <h8>
+              fav score: $score$ 
+              <h9>$score_ent$</h9>
+			  $endif$</h8>
+              $if(isadmin)$<br><br>
+               <div id="adminmute">
+              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+              </div>
+              $endif$
+
+         
+        
+             
+              
+              $if(is_home)$
+              <div id="avatar-editing" style="display: none">
+                <input id="uploadp" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+	     <br> <h3>contact info</h3>
+              $if(contact)$
+	      <br><br><div id="contact" class="linkify">$contact$</div>
+	      $else$
+	      <br><br><div><img id="contact" src="/static/img/noinfo.png"></div>
+	      $endif$            
+	      <br>
+              
+	      <br><br><h3>bio</h3>
+              $if(bio)$
+	     <br><br> <div id="bio" class="linkify">$bio$</div>
+	      $else$
+	      <br><br><div><img id="bio" src="/static/img/noinfo.png"></div>
+	      $endif$
+
+       
+    
+
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
+
+              <br>
+              
+         <a href="http://dump.fm/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
+              
+              <div id="date">
+                <div type="text" id="datepicker"></div></div>
+	    </div>
+	    
+	          <div id="favbox" style="display: hidden"></div>
+          <div id="messageList">
+          
+            $if(dumps)$ <span class="content">
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            
+            
+
+          </span>
+         
+
+
+	    $else$
+	    no dumps
+	    $endif$
+	    </div>
+	    
+
+         <div id="msgInputDiv">
+    <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" /> 
+                  <a href="#" onClick="alert('Coming soon!');return false"> <input id="msgSubmit"value="private message"/></a>
+             $if(prev)$
+              <a href="/$nick$/$prev$"><input id="upload" value="Prev"></a>
+  $else$
+<input id="upload">
+ $endif$
+
+          $if(next)$
+                       <a href="/$nick$/$next$">  <input id="webcam-button-upload" value="Next"></a>
+     $else$
+     <input id="webcam-button-upload" value="nomodumps">
+     $endif$
+     
+              
+             <a href="http://dump.fm/u/$nick$/favorites">  <button id="palette-button"><img src="/static/img/palette.gif"></button></a> 
+              
+              </div>
+  <div id="footerc">
+              $footer()$
+            </div>
+          </div>
+    </div></div></div>
+  </body>
+</html>
diff --git a/template/profile.st b/template/profile.st
index e530e4a..f648e43 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -8,38 +8,39 @@
     <script>
       jQuery(document).ready(initProfile);
     </script> 
+
   </head>
-  <body class="profile">
+  <body>
     $banner()$
-    <div id="chatrap">  
-      <div id="headerbar"></div>
-      <div id="log">
-        <div id="loghead">
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
         </div>
-        <br>
-        <div id="posts">
-          <div id="cats">
-            $if(dumps)$
-            $dumps:{ d | $profile_dump(dump=d)$ }$
-            <div id="profile">
-
-              <h2>$nick$               </h2><br>
+  
+        <div id="messagePanep">
+          <div id="userListp"><br>    $if(is_home)$<br>$endif$  
+               <h2>  
+                    $if(avatar)$
+               <img id="avatarPic" src="$avatar$"/>
+                $else$<br><br>
+              <img id="avatarPic" src="/static/img/noinfo.png">
+              $endif$
+                 
+               $nick$               </h2><br>
               $if(score_ent)$
               <h8>
               fav score: $score$ 
               <h9>$score_ent$</h9>
 			  $endif$</h8>
-              $if(isadmin)$
+              $if(isadmin)$<br><br>
                <div id="adminmute">
               <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
               </div>
               $endif$
 
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
+         
+        
+             
               
               $if(is_home)$
               <div id="avatar-editing" style="display: none">
@@ -48,19 +49,18 @@
               </div>
               $endif$
               
-	      <h3>contact info</h3>
+	     <br> <h3>contact info</h3>
               $if(contact)$
-	      <div id="contact" class="linkify">$contact$</div>
+	      <br><div id="contact" class="linkify">$contact$</div>
 	      $else$
-	      <div><img id="contact" src="/static/img/noinfo.png"></div>
+	    <div><img id="contact" src="/static/img/noinfo.png"><br><br></div>
 	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
+	  
+	      <br><br><h3>bio</h3>
               $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
+	    <br> <div id="bio" class="linkify">$bio$</div>
 	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
+	     <div><img id="bio" src="/static/img/noinfo.png"><br><br></div>
 	      $endif$
 
        
@@ -68,7 +68,7 @@
 
               $if(is_home)$
               <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              <div id="edit-toggle"><a href="#">edit profile</a></div><br><br>
               $endif$
 
               <br>
@@ -78,98 +78,45 @@
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
 	    </div>
-
-
-	    $else$
-	    <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <div>
-   $nick$'s first dump.fm post!  
-  </div>
-  <a href="/$nick$">  
-  <div id="logavatar">
-$if(dump.avatar)$
-  <img height="50" width="50" src="$dump.avatar$" /> 
-$else$  
-  <img height="50" width="50" src="/static/img/noinfo.png">  
-$endif$
-  </div></a>
-$if(dump.favorited)$
-  <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
-$else$
-  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
-$endif$
-  <div class="content2"><img src="/static/img/furieprofile.png"></div>
-<hr/>
-$share_buttons()$
-</div>
-	               <div id="profile">
-              <h2>$nick$</h2>
-
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
+	    
+	          <div id="favbox" style="display: hidden"></div>
+          <div id="messageList">
           
-              </div>
-              $endif$
+            $if(dumps)$ <span class="content">
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            
+            
 
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-              
-              $if(is_home)$
-              <div id="avatar-editing" style="display: none">
-                <input id="uploadp" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
-              </div>
-              $endif$
-              
-	      <h3>contact info</h3>
-              $if(contact)$
-	      <div id="contact" class="linkify">$contact$</div>
-	      $else$
-	      <div><img id="contact" src="/static/img/noinfo.png"></div>
-	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
-              $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
-	      $endif$
+          </span>
+         
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
+	    $else$
+	    no dumps
 	    $endif$
-            
-	    <p>&nbsp;</p>
-	    <div id="pnav">
+	    </div>
+	    
 
-              $if(next)$
-              <div id="pnavn"><a href="/$nick$/$next$">next &#9758;</a></div> 
-              $endif$
+         <div id="msgInputDiv">
+    <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" /> 
+                  <a href="#" onClick="alert('Coming soon!');return false"> <input id="msgSubmit"value="private message"/></a>
+             $if(prev)$
+              <a href="/$nick$/$prev$"><input id="prevbutton" value="<- Prev"></a>
+  $else$
+<input id="prevbutton">
+ $endif$
 
-              &nbsp;
-              $if(prev)$
-              <div id="pnavo">  <a href="/$nick$/$prev$">&#9756; prev</a></div>
-              $endif$
+          $if(next)$
+                       <a href="/$nick$/$next$">  <input id="nextbutton" value="Next ->"></a>
+     $else$
+     <input id="nextbutton" value="nomodumps">
+     $endif$
+     
               
-              <br><br>
-            </div>
-
-            <div id="footer">
+             <a href="http://dump.fm/u/$nick$/favorites">  <button id="palette-button"><img src="/static/img/palette.gif"></button></a> 
+              
+              </div>
+  <div id="footerc">
               $footer()$
             </div>
           </div>
diff --git a/template/profile_dump.st b/template/profile_dump.st
index 43d995e..8866ae4 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -1,6 +1,6 @@
 <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <div>
-    $dump.created_on$  -- in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
+  <div id="profiletxt">
+     $dump.created_on$  -- in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
   </div>
   <a href="/u/$dump.nick$">  
   <div id="logavatar">
diff --git a/template/share_buttons.st b/template/share_buttons.st
index 02736dc..a251cff 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,8 +1,11 @@
 <div class="buttons">
   <span class="other-sites">
+  <div id="profiletxt"> 
     <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
     <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
     <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
     <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+    <a href="http://dump.fm/p/$dump.nick$/$dump.message_id$"><img src="http://dump.fm/static/img/link.gif"></a>
+    </div>
   </span>
 </div>
\ No newline at end of file
diff --git a/template/single_message.st b/template/single_message.st
index df43eed..ab84668 100644
--- a/template/single_message.st
+++ b/template/single_message.st
@@ -3,7 +3,7 @@
     
     <title>dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/directory.css">
+    <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css">
     <script>
       jQuery(document).ready(initDirectory);
     </script>
@@ -12,30 +12,33 @@
   </head>
   <body>
     $banner()$
-    <div id="chatrap">
-      <div id="log">   
-	<div id="loghead"></div>
-        <br>
-        <div id="posts">            
-          <br>        
-          <div class="logged-dump" id="message-$message.message_id$">
-            <a href="/u/$message.nick$">
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
+        </div>
+  
+        <div id="messagePanep"> 
+            <a href="/u/$message.nick$"><br><br>
               <b>$message.nick$</b>
               $if(message.avatar)$
               <div style="border-image:url($message.avatar$)">  
-                <div id="logavatar">
+                <div id="avatarPic">
                   <img height="50" width="50" src="$message.avatar$"></img>
                 </div>
+                <hr>
               $endif$
             </a>
+                  <div id="messageList">
+          <div class="content" id="message-$message.message_id$">
+        
             <span class="linkify">$message.content$</span>
             <hr />
             </div>
             $share_buttons()$
           </div>
-          <!--<div id="footer">
+        <div id="footerc">
             $footer()$
-          </div>-->
+          </div>
         </div>
   </body>
 </html>
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
index cbc2f59..ced1ba4 100644
--- a/template/tagged_dumps.st
+++ b/template/tagged_dumps.st
@@ -12,7 +12,7 @@ $head()$
     <div id="chatrap">
       <div id="log">   
         <br>
-                         <div id="dprofile">
+                         <div id="profile">
             <h2>$page_title$ </h2><br><h3><br>
             
             
@@ -21,14 +21,14 @@ $head()$
             
             
             </div>
-        <div id="dposts">
+
           <br>
 
 $if(dumps)$
-  $dumps: { d |  <div class="dlogged-dump">$log_dump(dump=d)$
+  $dumps: { d |  $log_dump(dump=d)$
 
   
-  </div> }$
+}$
   $if(json_tags)$
 <script>
   $json_tags: { j | $j$;