diff --git a/courtroom.cpp b/courtroom.cpp
index d4b6f96..8f02da3 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -495,6 +495,9 @@ void Courtroom::set_widgets()
   set_size_and_pos(ui_evidence_overlay, "evidence_overlay");
   ui_evidence_overlay->set_image("evidenceoverlay.png");
 
+  set_size_and_pos(ui_evidence_delete, "evidence_delete");
+  ui_evidence_delete->set_image("deleteevidence.png");
+
   set_size_and_pos(ui_evidence_x, "evidence_x");
   ui_evidence_x->set_image("evidencex.png");
 
diff --git a/courtroom.h b/courtroom.h
index 8231ef4..3e5bff6 100644
--- a/courtroom.h
+++ b/courtroom.h
@@ -303,6 +303,7 @@ private:
   AOButton *ui_evidence_left;
   AOButton *ui_evidence_right;
   AOImage *ui_evidence_overlay;
+  AOButton *ui_evidence_delete;
   AOButton *ui_evidence_x;
   AOTextEdit *ui_evidence_description;
 
@@ -416,6 +417,7 @@ private slots:
 
   void on_evidence_button_clicked();
 
+  void on_evidence_delete_clicked();
   void on_evidence_x_clicked();
 
   void on_back_to_lobby_clicked();
diff --git a/evidence.cpp b/evidence.cpp
index 0e65194..046f18c 100644
--- a/evidence.cpp
+++ b/evidence.cpp
@@ -20,6 +20,7 @@ void Courtroom::construct_evidence()
 
   ui_evidence_overlay = new AOImage(ui_evidence, ao_app);
 
+  ui_evidence_delete = new AOButton(ui_evidence_overlay, ao_app);
   ui_evidence_x = new AOButton(ui_evidence_overlay, ao_app);
 
   ui_evidence_description = new AOTextEdit(ui_evidence_overlay);
@@ -71,6 +72,7 @@ void Courtroom::construct_evidence()
   connect(ui_evidence_name, SIGNAL(returnPressed()), this, SLOT(on_evidence_name_edited()));
   connect(ui_evidence_left, SIGNAL(clicked()), this, SLOT(on_evidence_left_clicked()));
   connect(ui_evidence_right, SIGNAL(clicked()), this, SLOT(on_evidence_right_clicked()));
+  connect(ui_evidence_delete, SIGNAL(clicked()), this, SLOT(on_evidence_delete_clicked()));
   connect(ui_evidence_x, SIGNAL(clicked()), this, SLOT(on_evidence_x_clicked()));
 
   ui_evidence->hide();
@@ -86,10 +88,11 @@ void Courtroom::set_evidence_list(QVector<evi_type> &p_evi_list)
 
 void Courtroom::set_evidence_page()
 {
+  /*
   if (m_cid == -1)
     return;
 
-  /*
+
   local_evidence_list.clear();
 
   QString evi_string = char_list.at(m_cid).evidence_string;
@@ -116,9 +119,6 @@ void Courtroom::set_evidence_page()
     i_button->reset();
   }
 
-  if (total_evidence == 0)
-    return;
-
   //to account for the "add evidence" button
   ++total_evidence;
 
@@ -237,9 +237,11 @@ void Courtroom::on_evidence_hover(int p_id, bool p_state)
       ui_evidence_name->setText("Add new evidence...");
     else if (final_id < local_evidence_list.size())
       ui_evidence_name->setText(local_evidence_list.at(final_id).name);
-    else
-      ui_evidence_name->setText(local_evidence_list.at(current_evidence).name);
   }
+  else if (current_evidence < local_evidence_list.size())
+    ui_evidence_name->setText(local_evidence_list.at(current_evidence).name);
+  else
+    ui_evidence_name->setText("");
 }
 
 void Courtroom::on_evidence_left_clicked()
@@ -256,6 +258,16 @@ void Courtroom::on_evidence_right_clicked()
   set_evidence_page();
 }
 
+void Courtroom::on_evidence_delete_clicked()
+{
+  ui_evidence_description->setReadOnly(true);
+  ui_evidence_overlay->hide();
+
+  ao_app->send_server_packet(new AOPacket("DE#" + QString::number(current_evidence) + "#%"));
+
+  current_evidence = 0;
+}
+
 void Courtroom::on_evidence_x_clicked()
 {
   ui_evidence_description->setReadOnly(true);
diff --git a/lobby.cpp b/lobby.cpp
index 7c8f08f..2a7589f 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -24,7 +24,7 @@ Lobby::Lobby(AOApplication *p_ao_app) : QMainWindow()
   ui_about = new AOButton(this, ao_app);
   ui_server_list = new QListWidget(this);
   ui_player_count = new QLabel(this);
-  ui_description = new QPlainTextEdit(this);
+  ui_description = new AOTextArea(this);
   ui_chatbox = new AOTextArea(this);
   ui_chatbox->setOpenExternalLinks(true);
   ui_chatname = new QLineEdit(this);
@@ -301,7 +301,7 @@ void Lobby::on_server_list_clicked(QModelIndex p_model)
   }
 
   ui_description->clear();
-  ui_description->appendPlainText(f_server.desc);
+  ui_description->append(f_server.desc);
 
   ui_description->moveCursor(QTextCursor::Start);
   ui_description->ensureCursorVisible();
diff --git a/lobby.h b/lobby.h
index ef56166..b2bfbef 100644
--- a/lobby.h
+++ b/lobby.h
@@ -58,7 +58,7 @@ private:
   QListWidget *ui_server_list;
 
   QLabel *ui_player_count;
-  QPlainTextEdit *ui_description;
+  AOTextArea *ui_description;
 
   AOTextArea *ui_chatbox;