99 files changed, 216 insertions, 156 deletions
diff --git a/src/site.clj b/src/site.clj
index cc7dfd3..cc7dfd3 100644..100755
--- a/src/site.clj
+++ b/src/site.clj
diff --git a/static/BubbleBlueL800x1600.png b/static/BubbleBlueL800x1600.png
index 3329e11..3329e11 100644..100755
--- a/static/BubbleBlueL800x1600.png
+++ b/static/BubbleBlueL800x1600.png
diff --git a/static/BubbleBlueR800x1600.png b/static/BubbleBlueR800x1600.png
index 320a743..320a743 100644..100755
--- a/static/BubbleBlueR800x1600.png
+++ b/static/BubbleBlueR800x1600.png
diff --git a/static/BubbleLtGreyL800x1600.png b/static/BubbleLtGreyL800x1600.png
index d0728da..d0728da 100644..100755
--- a/static/BubbleLtGreyL800x1600.png
+++ b/static/BubbleLtGreyL800x1600.png
diff --git a/static/BubbleLtGreyR800x1600.png b/static/BubbleLtGreyR800x1600.png
index 5c8abad..5c8abad 100644..100755
--- a/static/BubbleLtGreyR800x1600.png
+++ b/static/BubbleLtGreyR800x1600.png
diff --git a/static/BubblePinkL800x1600.png b/static/BubblePinkL800x1600.png
index a2e3ccb..a2e3ccb 100644..100755
--- a/static/BubblePinkL800x1600.png
+++ b/static/BubblePinkL800x1600.png
diff --git a/static/BubblePinkR800x1600.png b/static/BubblePinkR800x1600.png
index 97c59fb..97c59fb 100644..100755
--- a/static/BubblePinkR800x1600.png
+++ b/static/BubblePinkR800x1600.png
diff --git a/static/background.js b/static/background.js
index 8eed157..8eed157 100644..100755
--- a/static/background.js
+++ b/static/background.js
diff --git a/static/background13.gif b/static/background13.gif
index d087dad..d087dad 100644..100755
--- a/static/background13.gif
+++ b/static/background13.gif
diff --git a/static/background4.gif b/static/background4.gif
index 675add6..675add6 100644..100755
--- a/static/background4.gif
+++ b/static/background4.gif
diff --git a/static/bg-random.gif b/static/bg-random.gif
index 12ce8c5..12ce8c5 100644..100755
--- a/static/bg-random.gif
+++ b/static/bg-random.gif
diff --git a/static/bg55.png b/static/bg55.png
index f16a548..f16a548 100644..100755
--- a/static/bg55.png
+++ b/static/bg55.png
diff --git a/static/bgb.png b/static/bgb.png
index 3a1c5d2..3a1c5d2 100644..100755
--- a/static/bgb.png
+++ b/static/bgb.png
diff --git a/static/bgpat.gif b/static/bgpat.gif
index 86edce9..86edce9 100644..100755
--- a/static/bgpat.gif
+++ b/static/bgpat.gif
diff --git a/static/bgto.gif b/static/bgto.gif
index 3411a54..3411a54 100644..100755
--- a/static/bgto.gif
+++ b/static/bgto.gif
diff --git a/static/blink.gif b/static/blink.gif
index 0776f7f..0776f7f 100644..100755
--- a/static/blink.gif
+++ b/static/blink.gif
diff --git a/static/bluego.png b/static/bluego.png
index 8bcd35f..8bcd35f 100644..100755
--- a/static/bluego.png
+++ b/static/bluego.png
diff --git a/static/britglobe2.gif b/static/britglobe2.gif
index c972e08..c972e08 100644..100755
--- a/static/britglobe2.gif
+++ b/static/britglobe2.gif
diff --git a/static/brokenlink.gif b/static/brokenlink.gif
index 0e18a55..0e18a55 100644..100755
--- a/static/brokenlink.gif
+++ b/static/brokenlink.gif
diff --git a/static/bubley.png b/static/bubley.png
index fe6eb82..fe6eb82 100644..100755
--- a/static/bubley.png
+++ b/static/bubley.png
diff --git a/static/cat.jpeg b/static/cat.jpeg
new file mode 100644
index 0000000..f6bfa16
--- /dev/null
+++ b/static/cat.jpeg
diff --git a/static/chat.st b/static/chat.st
new file mode 100755
index 0000000..e601350
--- /dev/null
+++ b/static/chat.st
@@ -0,0 +1,69 @@
+<html>
+  <head>
+    <title>dump.fm</title>
+    <link rel="stylesheet" type="text/css" href="/static/reset.css">
+    <link rel="stylesheet" type="text/css" href="static/pichat.css">
+
+    <link rel="shortcut icon" href="/static/favicon.ico">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/sha1.js"></script>
+    <script type="text/javascript" src="/static/pichat.js"></script>
+    <script>
+      jQuery(document).ready(initChat);
+      var Nick = $json_user_nick$;
+    </script>   
+  </head>
+
+<body>
+    
+
+    $header()$
+
+<div id="chatrap"><div id="logc">
+    <div id="content">
+
+        <div id="messagetabs"></div>
+        <div id="rapper">
+            <div id="loghead"></div>
+          </div>
+      <div id="userList">
+            $users: { u |
+    <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br>
+      <hr>
+    </div>
+        }$
+      </div>
+          
+          <div id="messagePane">
+            <div id="messageList">
+              $messages: { m |
+                  <div class="msgDiv oldmsg"><b>$m.nick$: </b>
+                    <span class="content">$m.content$<span></div>
+              }$
+              <hr />
+            </div>
+            $if(user_nick)$
+            <div id="msgInputDiv">
+              <input id="msgInput" class="msgInput" type="input" />
+              <input id="msgSubmit" type="submit" value="Send Image URL"
+                      />
+            </div>
+            $endif$
+          </div>
+        </div>
+        
+      </div>
+    </div>
+    </div>
+
+      </div>
+   
+    </div>
+        <div id="footerc">
+       <p>
+       $footer()$</p>
+       <p>
+       </p>
+     </div>
+  </body>
+</html>
diff --git a/static/cloudbg1.png b/static/cloudbg1.png
index f397899..f397899 100644..100755
--- a/static/cloudbg1.png
+++ b/static/cloudbg1.png
diff --git a/static/cloudbg2.png b/static/cloudbg2.png
index a1d2b6e..a1d2b6e 100644..100755
--- a/static/cloudbg2.png
+++ b/static/cloudbg2.png
diff --git a/static/d.png b/static/d.png
index 63a7bbb..63a7bbb 100644..100755
--- a/static/d.png
+++ b/static/d.png
diff --git a/static/d3d1.gif b/static/d3d1.gif
index 0e88f7b..0e88f7b 100644..100755
--- a/static/d3d1.gif
+++ b/static/d3d1.gif
diff --git a/static/dblue.png b/static/dblue.png
index 3a99764..3a99764 100644..100755
--- a/static/dblue.png
+++ b/static/dblue.png
diff --git a/static/dblue2.png b/static/dblue2.png
index 0b7253b..0b7253b 100644..100755
--- a/static/dblue2.png
+++ b/static/dblue2.png
diff --git a/static/dddump.png b/static/dddump.png
index 593f9a2..593f9a2 100644..100755
--- a/static/dddump.png
+++ b/static/dddump.png
diff --git a/static/dddump2.png b/static/dddump2.png
index df200c7..df200c7 100644..100755
--- a/static/dddump2.png
+++ b/static/dddump2.png
diff --git a/static/dumgradbub2.png b/static/dumgradbub2.png
index 1de255d..1de255d 100644..100755
--- a/static/dumgradbub2.png
+++ b/static/dumgradbub2.png
diff --git a/static/dump.css b/static/dump.css
index 95e3196..95e3196 100644..100755
--- a/static/dump.css
+++ b/static/dump.css
diff --git a/static/dump.gif b/static/dump.gif
index f1633be..f1633be 100644..100755
--- a/static/dump.gif
+++ b/static/dump.gif
diff --git a/static/dumpbgword.gif b/static/dumpbgword.gif
index 27754fa..27754fa 100644..100755
--- a/static/dumpbgword.gif
+++ b/static/dumpbgword.gif
diff --git a/static/dumpbub.png b/static/dumpbub.png
index 382a25c..382a25c 100644..100755
--- a/static/dumpbub.png
+++ b/static/dumpbub.png
diff --git a/static/dumpd.gif b/static/dumpd.gif
index e571668..e571668 100644..100755
--- a/static/dumpd.gif
+++ b/static/dumpd.gif
diff --git a/static/dumpd.png b/static/dumpd.png
index 0f56f50..0f56f50 100644..100755
--- a/static/dumpd.png
+++ b/static/dumpd.png
diff --git a/static/dumpl2.png b/static/dumpl2.png
index f0c7263..f0c7263 100644..100755
--- a/static/dumpl2.png
+++ b/static/dumpl2.png
diff --git a/static/footer.png b/static/footer.png
index d83aafd..d83aafd 100644..100755
--- a/static/footer.png
+++ b/static/footer.png
diff --git a/static/footer1.png b/static/footer1.png
index b471698..b471698 100644..100755
--- a/static/footer1.png
+++ b/static/footer1.png
diff --git a/static/forealz.gif b/static/forealz.gif
index 63723bf..63723bf 100644..100755
--- a/static/forealz.gif
+++ b/static/forealz.gif
diff --git a/static/fuckit.gif b/static/fuckit.gif
index 9f94cf6..9f94cf6 100644..100755
--- a/static/fuckit.gif
+++ b/static/fuckit.gif
diff --git a/static/gaga.gif b/static/gaga.gif
index efaf4eb..efaf4eb 100644..100755
--- a/static/gaga.gif
+++ b/static/gaga.gif
diff --git a/static/getstarted.gif b/static/getstarted.gif
index b581589..b581589 100644..100755
--- a/static/getstarted.gif
+++ b/static/getstarted.gif
diff --git a/static/getstarted.html b/static/getstarted.html
index c1ac1b1..c1ac1b1 100644..100755
--- a/static/getstarted.html
+++ b/static/getstarted.html
diff --git a/static/grad2.png b/static/grad2.png
index c9f0c0d..c9f0c0d 100644..100755
--- a/static/grad2.png
+++ b/static/grad2.png
diff --git a/static/header.st b/static/header.st
index cd8be34..cd8be34 100644..100755
--- a/static/header.st
+++ b/static/header.st
diff --git a/static/index.html b/static/index.html
index fb5224e..2284bfc 100644..100755
--- a/static/index.html
+++ b/static/index.html
@@ -1,3 +1,5 @@
+</html>
+
 <head>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
     <script type="text/javascript" src="static/sha1.js"></script>
@@ -9,7 +11,7 @@
     <link rel="stylesheet" type="text/css" href="static/reset.css">
         <link rel="shortcut icon" href="static/favicon.ico">
         
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head>
 <style type="text/css">
 <!--
 .white a:link {
@@ -130,7 +132,7 @@ body {
 	
 	background-color:#e3e3e3;
 	
-	background-image:url(static/brokenlink.gif);
+	background-image:url(static/brokenlinkk.gif);
 	background-position:center;
 	
 	background-repeat:no-repeat;
@@ -224,4 +226,5 @@ body {
 
 <div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onclick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div>
 
-</body>
-\ No newline at end of file
+</body>
+</html>
+\ No newline at end of file
diff --git a/static/index5.html b/static/index5.html
index b30e42f..b30e42f 100644..100755
--- a/static/index5.html
+++ b/static/index5.html
diff --git a/static/lil-wayne.jpg b/static/lil-wayne.jpg
index 34c6481..34c6481 100644..100755
--- a/static/lil-wayne.jpg
+++ b/static/lil-wayne.jpg
diff --git a/static/lillogo.png b/static/lillogo.png
index fff9d17..fff9d17 100644..100755
--- a/static/lillogo.png
+++ b/static/lillogo.png
diff --git a/static/log4.png b/static/log4.png
index de76494..de76494 100644..100755
--- a/static/log4.png
+++ b/static/log4.png
diff --git a/static/logo.png b/static/logo.png
index a52b0c9..a52b0c9 100644..100755
--- a/static/logo.png
+++ b/static/logo.png
diff --git a/static/main.css b/static/main.css
index b3eef67..b3eef67 100644..100755
--- a/static/main.css
+++ b/static/main.css
diff --git a/static/main2.css b/static/main2.css
index 5eeab65..5eeab65 100644..100755
--- a/static/main2.css
+++ b/static/main2.css
diff --git a/static/mark1.png b/static/mark1.png
index 50566ba..50566ba 100644..100755
--- a/static/mark1.png
+++ b/static/mark1.png
diff --git a/static/mask_shaq.jpg b/static/mask_shaq.jpg
index 4c04e8b..4c04e8b 100644..100755
--- a/static/mask_shaq.jpg
+++ b/static/mask_shaq.jpg
diff --git a/static/over.png b/static/over.png
index f80754b..f80754b 100644..100755
--- a/static/over.png
+++ b/static/over.png
diff --git a/static/pichat.css b/static/pichat.css
index ed0d531..a91c0f5 100755..100644
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -11,7 +11,7 @@ body {
     overflow: auto;
 }
 
-#chatbox {
+#chatboxx {
     position: fixed;
     top:80px;
 }
@@ -38,17 +38,19 @@ body {
 
 #messagePane {
 	border: 2px solid #15fff3;
-	height: 70%;
+height:80%;
 	padding: 5px;
-	position: fixed;
-	width: 68%;
-	max-width:1500px;
+	position:fixed;
+	width: 98%;
+
 	background-color:#FFF;
-	left:10%;
-	top:105px;
+	left:7px;
+	right:10px;
+	top:60px;
 	float: left;
+	min-width:500px;
 	z-index:5;
-	right: 10%;
+
 }
 
 #messageList {
@@ -72,39 +74,50 @@ body {
 }
 
 #msgInputDiv {
-	height: 15px;
 	position:relative;
 	min-width:500px;
-	width: 700px;
+left:0px;
+bottom:6px;
+
+	width: 100%;
 }
 
 #msgInput {
-    width: 80%;
-    margin-right: 5px;
+    width: 100%;
+
     margin-top: 15px;
     position:relative;
+		border:2px solid #999;
+height:36px;
+font-size:20px;
     min-width:500px;
 }
+.msgInput {
 
-#msgSubmit {
-			position:relative;
-		display:inline-block;
-		width:120px;
-	
-		text-align:center;
-		cursor:pointer;
-		border:2px solid #999;
-                background-color:#087cff;
 	
-	    -moz-border-radius:2px;
-	    -webkit-border-radius:2px;
-	    -opera-border-radius:2px;
-	    -khtml-border-radius:2px;
-	    border-radius:2px;
-		font-size:12px;
-		color:#fff;
-	
-		text-shadow:1px 1px 3px rgba(0,0,0,0.5);
+    min-width:500px;
+}
+
+#msgSubmit {
+	position:absolute;
+	display:inline-block;
+	width:120px;
+height:35px;
+right:0px;
+font-size:20px;
+top:15px;
+	text-align:center;
+	cursor:pointer;
+
+	background-color:#087cff;
+	-moz-border-radius:2px;
+	-webkit-border-radius:2px;
+	-opera-border-radius:2px;
+	-khtml-border-radius:2px;
+	border-radius:2px;
+	font-size:12px;
+	color:#fff;
+	text-shadow:1px 1px 3px rgba(0,0,0,0.5);
 	
 
 }
@@ -135,18 +148,18 @@ body {
 
 #userList {
 	overflow-x: hidden;
-	border: 1px solid #000;
-	height: 70%;
+
+	height: 78%;
 	margin: 0px;
-	position: fixed;
+	position: absolute;
 	padding: 5px;
-	top:105px;
-	width: 9%;
+	top:70px;
+	width: 130px;
 	float:right;
-	right: 10%;
+	right: 40px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 14px;
-	text-transform: uppercase;
+	font-weight:400;
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -159,19 +172,45 @@ body {
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
-	min-width:72px;
+	min-width:90px;
 	line-height:15px;
-	background-color:#FFF;
+	text-overflow:ellipsis;
+
+
 	z-index:18;
 	text-align: left;
 }
-.userList
-img{
-    max-width:50px;
-    width: expression(this.width > 50 ? 50: true);
-    max-height:50px;
-    height: expression(this.width > 50 ? 50: true);
-    max-width:50px;}
+.username{height:32px;
+margin-top:2px;
+line-height:20px;
+min-width:90px;
+overflow:hidden;
+
+}
+#userList 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:50px;
+	
+	border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	-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;
+}
 
 #userListicon {
     overflow: auto;
@@ -195,6 +234,15 @@ img{
     text-transform:none;
     
 }
+#avatar
+{
+	
+	right:1px;
+	float:right;
+	text-align:left;
+	width:auto;
+	
+}
 #lillogo {
     bottom:0px;
     position:absolute;
diff --git a/static/pichat.js b/static/pichat.js
index 826bcba..14af670 100755
--- a/static/pichat.js
+++ b/static/pichat.js
@@ -15,7 +15,7 @@ function escapeHtml(txt) {
 }
 
 function buildUserDiv(user) {
-    return '<div>' + escapeHtml(user) + '</div>';
+    return '<div class="username"><img src="/static/cat.jpeg" width="50" height="50">' + escapeHtml(user) + '</div>';
 }
 
 // http://stackoverflow.com/questions/37684/replace-url-with-html-links-javascript
diff --git a/static/profile.css b/static/profile.css
index 72bf4c7..2984f43 100644
--- a/static/profile.css
+++ b/static/profile.css
@@ -2,14 +2,14 @@
 	float: right;
 	padding: 20px;
 	width: 180px;
-	margin-right:10%;
 	margin-top:0px;
 	background-color:#F7F7F7;
-	background-image:url(/static/cloudbg2.png);
+	background-image:url(/static/spex.ppng);
+	border:solid 5px #F5F5F5;
 	background-position:center;
 	z-index:10;
-	box-shadow:rgba(0,0,0,0.5) 0px 0px 24px; border-radius:5px;
-	
+	box-shadow:rgba(0,0,0,0.5) 0px 0px 24px;
+	border-radius:5px;
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
 	-webkit-border-top-left-radius:5px;
@@ -23,10 +23,10 @@
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 	min-height:600px;
-	
+	margin-right: 5%;
       }
 #chatrap{
-	top: 105px;
+	top: 80px;
 	left:0px;
 	position:absolute;
 	width: 100%;
@@ -50,8 +50,8 @@
 }
 #log
 {
-	margin-right:10%;
-	margin-left:11%;
+	margin-right:5%;
+	margin-left:5%;
 	background-color:#FFF;
 	padding-left: 20px;
 	padding-bottom: 20px;
@@ -123,9 +123,11 @@
           overflow: hidden;
           text-overflow: ellipsis;
       }
-	  h2 {color:#989898;
-	  letter-spacing:-1px;
-	  font-weight:lighter;}
+	  h2 {
+	color:#000;
+	letter-spacing:-1px;
+	font-weight:lighter;
+}
 
       img#avatarPic {
          max-height:250px;
@@ -161,4 +163,3 @@ body,td,th {
 	
 }@charset "UTF-8";
 /* CSS Document */
-
diff --git a/static/register.html b/static/register.html
index acfaca4..e2ead5f 100755
--- a/static/register.html
+++ b/static/register.html
@@ -1,3 +1,5 @@
+<html>
+
 <head>
 
     <link rel="shortcut icon" href="static/favicon.ico">
@@ -10,7 +12,7 @@
     <link rel="stylesheet" type="text/css" href="static/reset.css">
         <link rel="shortcut icon" href="static/favicon.ico">
         
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head>
 <style type="text/css">
 <!--
 .white a:link {
@@ -63,7 +65,7 @@
 	width:500px;
 	margin: 0px auto -1px auto;
 	top:150px;
-	height:420px;
+	height:380px;
 	z-index:2;
 	opacity:0.9;
 	border-top-left-radius:10px;
@@ -132,7 +134,7 @@ body {
 	
 	background-color:#e3e3e3;
 	
-	background-image:url(static/brokenlink.gif);
+	background-image:url(static/brokenlinkk.gif);
 	background-position:center;
 	
 	background-repeat:no-repeat;
@@ -208,13 +210,9 @@ body {
     <p align="right" class="line">&nbsp;</p>
     <p align="center" class="line">Talk with pictures. 
     <h1 align="center"><br />
+    </h1>
     <div id="registerbox">
       <div align="right">
-        <p align="right" class="line2">With dump.fm you can share images<br>
-          from around the web or ones on your</p>
-        <p align="right" class="line2">computer, in realtime.</p>
-        <p align="right" class="line2"><br>
-        <em>We think you'll really dig it.</em></p>
         <h1>&nbsp;</h1>
         <h1><span>username</span>
           <input type="text" class="feild"id="nickInput" />
@@ -232,7 +230,7 @@ body {
         </h1>
                   <div align="center">
                   
-                    <input type="submit" class="submit" id="submit" value="register" />
+                    <input type="submit" class="submit" id="submit" value="Done" />
         </div>
       </div>
     </div>
@@ -249,4 +247,5 @@ body {
 
 <div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onClick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div>
 
-</body>
-\ No newline at end of file
+</body>
+</html>
+\ No newline at end of file
diff --git a/static/rhianamoney.gif b/static/rhianamoney.gif
index 99f348a..99f348a 100644..100755
--- a/static/rhianamoney.gif
+++ b/static/rhianamoney.gif
diff --git a/static/s.png b/static/s.png
index fdc8c1d..fdc8c1d 100644..100755
--- a/static/s.png
+++ b/static/s.png
diff --git a/static/shaq.gif b/static/shaq.gif
index cfdaa11..cfdaa11 100644..100755
--- a/static/shaq.gif
+++ b/static/shaq.gif
diff --git a/static/shaqg.gif b/static/shaqg.gif
new file mode 100644
index 0000000..6106d3d
--- /dev/null
+++ b/static/shaqg.gif
diff --git a/static/slo.png b/static/slo.png
index 6ad74e6..6ad74e6 100644..100755
--- a/static/slo.png
+++ b/static/slo.png
diff --git a/static/spex.png b/static/spex.png
index fd0231f..fd0231f 100644..100755
--- a/static/spex.png
+++ b/static/spex.png
diff --git a/static/startpage.html b/static/startpage.html
index 85f3350..85f3350 100644..100755
--- a/static/startpage.html
+++ b/static/startpage.html
diff --git a/static/startpage1.html b/static/startpage1.html
index dbf5edf..dbf5edf 100644..100755
--- a/static/startpage1.html
+++ b/static/startpage1.html
diff --git a/static/startpage7.html b/static/startpage7.html
index eea492c..eea492c 100644..100755
--- a/static/startpage7.html
+++ b/static/startpage7.html
diff --git a/static/starts/bg4.png b/static/starts/bg4.png
index e20fda8..e20fda8 100644..100755
--- a/static/starts/bg4.png
+++ b/static/starts/bg4.png
diff --git a/static/starts/bottoml.png b/static/starts/bottoml.png
index 0f52893..0f52893 100644..100755
--- a/static/starts/bottoml.png
+++ b/static/starts/bottoml.png
diff --git a/static/starts/bottomr.png b/static/starts/bottomr.png
index 5904272..5904272 100644..100755
--- a/static/starts/bottomr.png
+++ b/static/starts/bottomr.png
diff --git a/static/starts/cloudbg.png b/static/starts/cloudbg.png
index f397899..f397899 100644..100755
--- a/static/starts/cloudbg.png
+++ b/static/starts/cloudbg.png
diff --git a/static/starts/cloudbg1.png b/static/starts/cloudbg1.png
index f397899..f397899 100644..100755
--- a/static/starts/cloudbg1.png
+++ b/static/starts/cloudbg1.png
diff --git a/static/starts/getstarted.gif b/static/starts/getstarted.gif
index b581589..b581589 100644..100755
--- a/static/starts/getstarted.gif
+++ b/static/starts/getstarted.gif
diff --git a/static/starts/logbg.png b/static/starts/logbg.png
index 0e41857..0e41857 100644..100755
--- a/static/starts/logbg.png
+++ b/static/starts/logbg.png
diff --git a/static/starts/main.css b/static/starts/main.css
index 8503c50..8503c50 100644..100755
--- a/static/starts/main.css
+++ b/static/starts/main.css
diff --git a/static/starts/mark1.png b/static/starts/mark1.png
index 50566ba..50566ba 100644..100755
--- a/static/starts/mark1.png
+++ b/static/starts/mark1.png
diff --git a/static/starts/startpage1.html b/static/starts/startpage1.html
index b938eb5..b938eb5 100644..100755
--- a/static/starts/startpage1.html
+++ b/static/starts/startpage1.html
diff --git a/static/starts/topl.png b/static/starts/topl.png
index dcfe5b9..dcfe5b9 100644..100755
--- a/static/starts/topl.png
+++ b/static/starts/topl.png
diff --git a/static/starts/topr.png b/static/starts/topr.png
index 9cfab08..9cfab08 100644..100755
--- a/static/starts/topr.png
+++ b/static/starts/topr.png
diff --git a/static/test.html b/static/test.html
index bd0779a..965132d 100755
--- a/static/test.html
+++ b/static/test.html
@@ -1,75 +1,14 @@
 <html>
-  <head>
-    <style>
-      #container {
-      position: relative;
-      width: 1000px;
-      }
-      #left {
-      border: 1px solid green;
-      height: 600px;
-      left: -89px;
-      margin: 0px auto 10%;
-      margin-left: 10%;
-      padding: 20px;
-      position: absolute;
-      top: 1%;
-      width: 500px;
-      }
-
-      #right {
-      border: 1px solid blue;
-      height: 600px;
-      margin: 0px 10%;
-      margin-right: 10%;
-      padding: 20px;
-      position: absolute;
-      left: 450px;
-      top: 1%;
-      width: 150px;
-      }      
-    </style>
-  </head>
-
-  <body>
-    <div id="container">
-    <div id="left">
-      I saw the best minds of my generation destroyed by 
-madness, starving hysterical naked, 
-dragging themselves through the negro streets at dawn 
-looking for an angry fix, 
-angelheaded hipsters burning for the ancient heavenly 
-connection to the starry dynamo in the machin- 
-ery of night, 
-who poverty and tatters and hollow-eyed and high sat 
-up smoking in the supernatural darkness of 
-cold-water flats floating across the tops of cities 
-contemplating jazz, 
-who bared their brains to Heaven under the El and 
-saw Mohammedan angels staggering on tene- 
-ment roofs illuminated, 
-who passed through universities with radiant cool eyes 
-hallucinating Arkansas and Blake-light tragedy 
-among the scholars of war, 
-who were expelled from the academies for crazy & 
-publishing obscene odes on the windows of the 
-skull, 
-who cowered in unshaven rooms in underwear, burn- 
-ing their money in wastebaskets and listening 
-to the Terror through the wall, 
-who got busted in their pubic beards returning through 
-Laredo with a belt of marijuana for New York, 
-who ate fire in paint hotels or drank turpentine in 
-Paradise Alley, death, or purgatoried their 
-torsos night after night 
-with dreams, with drugs, with waking nightmares, al- 
-cohol and cock and endless balls, 
-incomparable blind; streets of shuddering cloud and 
-lightning in the mind leaping toward poles of 
-    </div>
-    <div id="right">
-    </div>
-    </div>
-  </body>
-
-</html>
+	<head>
+		<style>
+			#test img {
+				border: 2px solid pink;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="test">
+			<img src="/static/cat.jpeg">
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/static/topb.png b/static/topb.png
index 51cc4cc..51cc4cc 100644..100755
--- a/static/topb.png
+++ b/static/topb.png
diff --git a/static/topbg.gif b/static/topbg.gif
index 9432446..9432446 100644..100755
--- a/static/topbg.gif
+++ b/static/topbg.gif
diff --git a/static/topbi.gif b/static/topbi.gif
index a032a08..a032a08 100644..100755
--- a/static/topbi.gif
+++ b/static/topbi.gif
diff --git a/static/topgrad.png b/static/topgrad.png
index b43b6cd..b43b6cd 100644..100755
--- a/static/topgrad.png
+++ b/static/topgrad.png
diff --git a/static/try.gif b/static/try.gif
index cbe2d89..cbe2d89 100644..100755
--- a/static/try.gif
+++ b/static/try.gif
diff --git a/static/try.png b/static/try.png
index a7021f8..a7021f8 100644..100755
--- a/static/try.png
+++ b/static/try.png
diff --git a/static/uggs.gif b/static/uggs.gif
index a8b763a..a8b763a 100644..100755
--- a/static/uggs.gif
+++ b/static/uggs.gif
diff --git a/static/up.png b/static/up.png
index b13da1c..b13da1c 100644..100755
--- a/static/up.png
+++ b/static/up.png
diff --git a/static/wayne.gif b/static/wayne.gif
index 13dde42..13dde42 100644..100755
--- a/static/wayne.gif
+++ b/static/wayne.gif
diff --git a/static/wordlogo.gif b/static/wordlogo.gif
index dbef59d..dbef59d 100644..100755
--- a/static/wordlogo.gif
+++ b/static/wordlogo.gif
diff --git a/static/wordlogo2.gif b/static/wordlogo2.gif
index b6f22da..b6f22da 100644..100755
--- a/static/wordlogo2.gif
+++ b/static/wordlogo2.gif
diff --git a/static/yb.png b/static/yb.png
index af2e410..af2e410 100644..100755
--- a/static/yb.png
+++ b/static/yb.png
diff --git a/template/chat.st b/template/chat.st
index 3a8f79f..e48b754 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm</title>
     <link rel="stylesheet" type="text/css" href="/static/reset.css">
-    <link rel="stylesheet" type="text/css" href="/static/pichat.css">
+    <link rel="stylesheet" type="text/css" href="static/pichat.css">
 
     <link rel="shortcut icon" href="/static/favicon.ico">
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
@@ -26,11 +26,12 @@
         <div id="rapper">
             <div id="loghead"></div>
           </div>
-          <div id="userList">
+      <div id="userList">
             $users: { u |
-            <div>$u$</div>
-            }$
-          </div>
+    <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br>
+    </div>
+        }$
+      </div>
           
           <div id="messagePane">
             <div id="messageList">
@@ -42,7 +43,7 @@
             </div>
             $if(user_nick)$
             <div id="msgInputDiv">
-              <input id="msgInput" type="input" />
+              <input id="msgInput" class="msgInput" type="input" />
               <input id="msgSubmit" type="submit" value="Send Image URL"
                       />
             </div>
diff --git a/template/header.st b/template/header.st
index 00dcba5..ec7c9f9 100755
--- a/template/header.st
+++ b/template/header.st
@@ -39,13 +39,13 @@
 	height: 69px;
 }
 #bar7{
-	top:31px;
+	top:35px;
 	position:absolute;
 	font-family: Arial, Helvetica, sans-serif;
 	width: 500px;
-	font-size: 20px;
+	font-size: 18px;
 	left: 150px;
-	margin-left: 11%;
+	margin-left: 1%;
 	margin-right: 8%;
 	letter-spacing: -1px;
 	z-index: 999;
@@ -62,7 +62,7 @@
 }
 #logo7{
 	top:20px;
-	margin-left: 10%;
+	margin-left: 1%;
 	margin-right: 10%;
 	z-index:1000;
 	float:left;
diff --git a/template/profile.st b/template/profile.st
index d0c3edd..d0c3edd 100644..100755
--- a/template/profile.st
+++ b/template/profile.st