diff --git a/Cargo.toml b/Cargo.toml
index dfe22a0..4c0bbd5 100755
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,6 @@ tokio = "^0.1.18"
 tokio-tls = "^0.2.1"
 native-tls = "^0.2"
 tokio-reactor = "^0.1.9"
-tokio-xmpp = "^1.0.0"
-xmpp-parsers = "^0.14.0"
 url = "^1.7.2"
 futures = "^0.1.27"
 sciter-rs = "^0.5.45"
diff --git a/dom/chat.css b/dom/chat.css
index e69de29..bbef34a 100644
--- a/dom/chat.css
+++ b/dom/chat.css
@@ -0,0 +1,18 @@
+div.chat {
+  height: *;
+  width: *;
+}
+
+
+div.chat h2 {
+   width: *; 
+   text-align: center; 
+   border-bottom: 1px solid #000; 
+   line-height: 0.1em;
+   margin: 10px 0 20px; 
+} 
+
+div.chat h2 span { 
+    background:#fff; 
+    padding:0 10px; 
+}
diff --git a/dom/containers.css b/dom/containers.css
index a2a120d..eb2092b 100644
--- a/dom/containers.css
+++ b/dom/containers.css
@@ -124,7 +124,7 @@ div.titlebar > .title {
   overflow: auto;
 }
 
-.grid, .news-grid {
+.grid {
   flow:grid(2 1 3,
             2 5 3,
             2 4 3);
@@ -132,7 +132,7 @@ div.titlebar > .title {
   height: *;
 }
 
-.grid > div:nth-child(1), .grid > div:nth-child(4), .news-grid > div:nth-child(1), .news-grid > div:nth-child(4) {
+.grid > div:nth-child(1), .grid > div:nth-child(4) {
   height: 80dip;
   width: *;
 }
@@ -142,11 +142,11 @@ div.titlebar > .title {
   width: 20dip;
 }
 
-.grid > div:nth-child(4), .news-grid > div:nth-child(4) {
+.grid > div:nth-child(4) {
   vertical-align: middle;
 }
 
-.grid > div:nth-child(4) *, .news-grid > div:nth-child(4) * {
+.grid > div:nth-child(4) * {
   text-transform: uppercase;
 }
 
@@ -164,48 +164,11 @@ div.titlebar > .title {
   height: *;
 }
 
-.news-grid > div:nth-child(2), .news-grid > div:nth-child(3) {
-  height: *;
-  width: *;
-}
-
-.news-grid > div:nth-child(5) {
-  width: *;
-  height: *;
-  padding: -10dip;
-}
-
 .join_server {
   min-width: 600dip;
   max-width: 700dip;
 }
 
-.news_items_container {
-  width: 400dip;
-  background-color: #0c151ee6;
-}
-
-.news_items_container > div:nth-child(2) {
-  aspect: "Emu.render_news_items";
-}
-
-.news_items_container > div:nth-child(2) > div {
-  width: *;
-  height: 60dip;
-}
-
-.news_items_container > div:nth-child(2) > div:nth-child(even) {
-  background-color: #0c151ee6;
-}
-
-.news_container {
-  width: 750dip;
-}
-
-.news_container .body {
-  padding-top: -5dip;
-}
-
 .logo {
   background-image: url(images/RenX_Logo.png);
   background-position: center;
diff --git a/dom/frontpage.htm b/dom/frontpage.htm
index 842c4ee..66273ef 100755
--- a/dom/frontpage.htm
+++ b/dom/frontpage.htm
@@ -1,4 +1,4 @@
-<html window-icon="images/rx.ico"   window-resizable>
+<html window-icon="images/rx.ico" window-frame="extended" window-resizable>
 <head>
 <title>RenegadeX-Launcher</title>
 <style>
@@ -6,6 +6,7 @@
   @import url(containers.css);
   @import url(fonts.css);
   @import url(news.css);
+  @import url(chat.css);
 </style>
 <script type="text/tiscript">
   include "events.tis";
diff --git a/dom/game.htm b/dom/game.htm
index 920aaf5..aa198c1 100644
--- a/dom/game.htm
+++ b/dom/game.htm
@@ -103,7 +103,7 @@ <h3>MAP: <span #map-name style="color: #CE5135;"></span></h3>
         <div.nowrap style="margin-right: 10dip;">connect disconnect users</div>
       </div>
       <div.body.mheight>
-        <div.chat readonly="true" spellcheck="false" style="behavior: htmlarea;">Chat is still under construction, our apologies!</div>
+        <div.chat readonly="true" spellcheck="false" style="behavior: htmlarea;"></p>Chat is still under construction, our apologies!</p></br><div.vflow><div.vflow><hr /></div>User connected<div.vflow><hr /></div></div></div>
         <div.reply>
           <input|text novalue="Type here..." enter="sendIrcMessage(this)" />
         </div>
diff --git a/dom/news.css b/dom/news.css
index a2c8b4f..eb70abe 100755
--- a/dom/news.css
+++ b/dom/news.css
@@ -1,3 +1,71 @@
+.news-grid {
+  flow:grid(2 1 3,
+            2 5 3,
+            2 4 3);
+  width: *;
+  height: *;
+}
+
+.news-grid > div:nth-child(1), .news-grid > div:nth-child(4) {
+  height: 80dip;
+  width: *;
+}
+
+.news-grid > div:nth-child(2), .news-grid > div:nth-child(3) {
+  height: *;
+  width: *;
+}
+
+.news-grid > div:nth-child(4) {
+  vertical-align: middle;
+}
+
+.news-grid > div:nth-child(4) * {
+  text-transform: uppercase;
+}
+
+.news-grid > div:nth-child(5) {
+  height: *;
+}
+
+.news_items_container {
+  width: 400dip;
+  background-color: #0c151ee6;
+}
+
+.news_items_container > div:nth-child(2) {
+  aspect: "Emu.render_news_items";
+}
+
+.news_items_container > div:nth-child(2) > div {
+  width: *;
+  height: 60dip;
+}
+
+.news_items_container > div:nth-child(2) > div:nth-child(even) {
+  background-color: #0c151ee6;
+}
+
+.news_container {
+  width: 750dip;
+  height: *;
+}
+
+.news_container > div:nth-child(2) {
+  padding-top: 10dip;
+  padding-bottom: 10dip;
+  background-color: #0c151ee6;
+  overflow-y: auto;
+  width: *;
+  height: *;
+  min-height: 0;
+  max-height: min-intrinsic;
+}
+
+#news {
+  height: min-intrinsic;
+}
+
 #news p {
   margin-top: 1em;
   margin-bottom: 1em;
@@ -7,19 +75,10 @@
   line-height: 1.5;
 }
 
-#news p:empty {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: 0;
-  margin-right: 0;
-  border-radius: 0;
-  line-height: 0;
-}
-
 #news img {
   border-style: none;
   aspect: "Emu.news_image";
-  image-rendering:optimize-quality;
+  image-rendering: optimize-quality;
 }
 
 #news img[data-ratio] {
diff --git a/dom/news.htm b/dom/news.htm
index 564d298..581612c 100644
--- a/dom/news.htm
+++ b/dom/news.htm
@@ -15,20 +15,22 @@ <h1><output game_version/></h1>
   <div.left-margin></div>
   <div.right-margin></div>
   <div.footer-margin></div>
-  <div.hflow.child-margin>
+  <div.hflow.child-margin.expand>
     <div.news_items_container.vflow>
       <div.titlebar>
-        <h3.title>[WIP] Chat</h3>
+        <h3.title.uppercase>Renegade-X news</h3>
       </div>
       <div.expand>
-        <div><pubDate>date</pubDate><p.title>title</p></div>
+        <div><pubDate>date</pubDate><p.type_news.uppercase>patch</p><p.title.uppercase>title</p></div>
       </div>
     </div>
     <div.news_container.vflow>
       <div.titlebar>
         <h3.title>[WIP] Chat</h3>
       </div>
-      <div.body.expand #news style="overflow-y:auto; margin-bottom: 10dip;"></div>
+      <div>
+        <div #news></div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/chat.rs b/src/chat.rs
index 4e686e2..3f2a5bd 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -1,113 +1,3 @@
 use std::thread;
 use std::sync::{Arc, Mutex};
-use futures::unsync::mpsc::{unbounded, UnboundedSender, UnboundedReceiver};
-use tokio_xmpp::{Client, Packet};
-use xmpp_parsers::{Jid, Element, TryFrom};
-use xmpp_parsers::message::{Body, MessageType};
-use xmpp_parsers::presence::{Presence, Show as PresenceShow, Type as PresenceType};
 
-
-//traits:
-use futures::{Stream, Sink, Future};
-
-/// The generic chat instance, should be transformed into a trait
-pub struct Chat<R: FnMut(ChatEvent)> {
-  connected: Arc<Mutex<bool>>,
-  receiver: R,
-  sender: UnboundedSender<tokio_xmpp::xmpp_codec::Packet>,
-  rt: tokio::runtime::Runtime,
-}
-
-pub enum ChatEvent {
-/// Send a string
-  Send(String),
-/// Receive a message
-  Receive(Message),
-/// Any event, like connect, disconnect, list of users?, etc.
-  Event(String),
-/// Any error that occurs
-  Error(Error)
-}
-
-pub struct Message {
-  //add something like a timestamp?
-  pub username: String,
-  pub message: String,
-}
-
-pub struct Error {
-  pub description: String,
-}
-
-fn make_presence() -> Element {
-  let mut presence = Presence::new(PresenceType::None);
-  presence.show = Some(PresenceShow::Chat);
-  presence.statuses.insert(String::from("en"), String::from("Echoing messages."));
-  presence.into()
-}
-
-impl<R: FnMut(ChatEvent)> Chat<R> {
-  pub fn new(receiver: R, username: String, password: String, server: String) -> Chat<R> {
-    let (client_sender, mut server_receiver) = unbounded();
-    let connected = Arc::new(Mutex::new(false));
-    let chat = Chat {
-      connected: connected.clone(),
-      receiver: receiver,
-      sender: client_sender,
-      rt: tokio::runtime::Runtime::new().unwrap(),
-    };
-    let client = tokio_xmpp::Client::new(&format!("{}@{}", username, server), &password).unwrap();
-    let (sink, stream) = client.split();
-/*
-    chat.rt.spawn(
-      server_receiver.forward(
-        sink.sink_map_err(|_| panic!("Pipe"))
-      ).map(|(server_receiver, mut sink)| {
-        drop(server_receiver);
-        let _ = sink.close();
-      }).map_err(|e| {
-        panic!("Send error: {:?}", e);
-      })
-    );
-*/
-/*
-    chat.rt.block_on(stream.for_each(|event| {
-      if event.is_online() {
-        println!("Online!");
-        //let presence = make_presence();
-        //tx.start_send(Packet::Stanza(presence)).unwrap();
-      } else if let Some(message) = event.into_stanza().and_then(|stanza| xmpp_parsers::message::Message::try_from(stanza).ok()) {
-        println!("{:?}", message);
-      }
-      futures::future::ok(())
-    }).map_err(|e| {
-      panic!("Send error: {:?}", e);
-    }));
-*/
-    chat
-  }
-/*
-  pub fn send(&self, message: String) {
-    self.rt.spawn(self.sender.send(message));
-  }
-*/
-  pub fn is_connected(&self) -> bool {
-    *self.connected.lock().unwrap()
-  }
-}
-
-/// encodes an input to an html-encoded output
-pub fn encode(input: String) -> String {
-  let mut output = String::new();
-  for chr in input.chars() {
-    match chr {
-      '0'..='9' | 'a'..='z' | 'A'..='Z' => {
-        output.push(chr);
-      },
-      _ => {
-        output.push_str(&format!("#{};", chr as u32));
-      },
-    }
-  }
-  output
-}
diff --git a/src/main.rs b/src/main.rs
index a8ca896..16d46ed 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -196,13 +196,15 @@ impl Handler {
       let res = client.request(req).and_then(|res| {
         use hyper::rt::*;
         let abort_in_error = res.status() != 200 && res.status() != 206;
-        res.into_body().concat2()
-      }).and_then(move |body| {
-        std::thread::spawn(move || {
-          let text : Value = ::std::str::from_utf8(&body).expect("Expected an utf-8 string").parse().unwrap();
-          callback.call(None, &make_args!(text), None).unwrap();
-        });
-        Ok(())
+        res.into_body().concat2().and_then(move |body| {
+          if !abort_in_error {
+            std::thread::spawn(move || {
+              let text : Value = ::std::str::from_utf8(&body).expect("Expected an utf-8 string").parse().unwrap();
+              callback.call(None, &make_args!(text), None).unwrap();
+            });
+          }
+          Ok(())
+        })
       });
       tokio::runtime::current_thread::Runtime::new().unwrap().block_on(res).unwrap();
     });
@@ -363,18 +365,21 @@ impl Handler {
               let abort_in_error = res.status() != 200 && res.status() != 206;
               let content_length : usize = res.headers().get("content-length").unwrap().to_str().unwrap().parse().unwrap();
               let progress_clone = progress.clone();
-              println!("{}", content_length.to_string());
               std::thread::spawn(move || {progress.call(None, &make_args!(format!("[0, {}]", content_length)), None).unwrap();});
               *download_contents_clone.lock().unwrap() = Vec::with_capacity(content_length);
               let mut downloaded = 0;
               res.into_body().for_each(move |chunk| {
                 let chunk_size = chunk.len();
-                downloaded += chunk_size;
-                let progress_clone = progress_clone.clone();
-                if downloaded*100/content_length > (downloaded-chunk_size)*100/content_length {
-                  std::thread::spawn(move || {progress_clone.call(None, &make_args!(format!("[{},{}]", downloaded.to_string(), content_length.to_string())), None).unwrap();});
+                if !abort_in_error {
+                  downloaded += chunk_size;
+                  let progress_clone = progress_clone.clone();
+                  if downloaded*100/content_length > (downloaded-chunk_size)*100/content_length {
+                    std::thread::spawn(move || {progress_clone.call(None, &make_args!(format!("[{},{}]", downloaded.to_string(), content_length.to_string())), None).unwrap();});
+                  }
+                  download_contents_clone.lock().unwrap().write_all(&chunk).map_err(|e| panic!("Writer encountered an error: {}", e))
+                } else {
+                  vec![].write_all(&chunk).map_err(|e| panic!("Writer encountered an error: {}", e))
                 }
-                download_contents_clone.lock().unwrap().write_all(&chunk).map_err(|e| panic!("Writer encountered an error: {}", e))
               })
             });
             // Put in an Option so poll_fn can return it later
@@ -416,7 +421,7 @@ impl Handler {
       });
     }
   }
-  fn fetch_resource(&self, url: Value, mut headers_value: Value, callback: Value, mut context: Value) {
+  fn fetch_resource(&self, url: Value, mut headers_value: Value, callback: Value, context: Value) {
     std::thread::spawn(move || {
       let url = url.as_string().unwrap().parse::<hyper::Uri>().unwrap();
       let https = hyper_tls::HttpsConnector::new(4).expect("TLS initialization failed");
@@ -431,19 +436,23 @@ impl Handler {
       let res = client.request(req).and_then(|res| {
         use hyper::rt::*;
         let abort_in_error = res.status() != 200 && res.status() != 206;
-        res.into_body().concat2()
-      }).and_then(move |body| {
-        std::thread::spawn(move || {
-          let text = ::std::str::from_utf8(&body).expect("Expected an utf-8 string");
-          callback.call(Some(context), &make_args!(text), None).unwrap();
-        });
-        Ok(())
+        res.into_body().concat2().and_then(move |body| {
+          std::thread::spawn(move || {
+            if !abort_in_error {
+              let text = ::std::str::from_utf8(&body).expect("Expected an utf-8 string");
+              callback.call(Some(context), &make_args!(text), None).unwrap();
+            } else {
+              callback.call(Some(context), &make_args!(""), None).unwrap();
+            }
+          });
+          Ok(())
+        })
       });
       tokio::runtime::current_thread::Runtime::new().unwrap().block_on(res).unwrap();
     });
   }
 
-  fn fetch_image(&self, url: Value, mut headers_value: Value, callback: Value, mut context: Value) {
+  fn fetch_image(&self, url: Value, mut headers_value: Value, callback: Value, context: Value) {
     std::thread::spawn(move || {
       let url = url.as_string().unwrap().parse::<hyper::Uri>().unwrap();
       let https = hyper_tls::HttpsConnector::new(4).expect("TLS initialization failed");
@@ -460,7 +469,7 @@ impl Handler {
         let abort_in_error = res.status() != 200 && res.status() != 206;
         res.into_body().concat2().and_then(move |body| {
           std::thread::spawn(move || {
-            if (!abort_in_error) {
+            if !abort_in_error {
               callback.call(Some(context), &make_args!(body.as_ref()), None).unwrap();
             } else {
               callback.call(Some(context), &make_args!(Value::null()), None).unwrap();
