diff --git a/src/GUI/ChatScreen.java b/src/GUI/ChatScreen.java
index f5f694af8a0277e3517f0aaaaecdbb655610623a..e98608ce5139a8e682f05d2117044b29a7e9043c 100644
--- a/src/GUI/ChatScreen.java
+++ b/src/GUI/ChatScreen.java
@@ -50,6 +50,7 @@ public class ChatScreen {
     public ChatScreen(Client client)
     {
         this.client = client;
+        activeDrawingUserBox = new JTextArea();
         yourNameDisplay.setText(client.getUserName());
         exitThisRoomButton.addActionListener(actionListener);
         sendButton.addActionListener(actionListener);
diff --git a/src/GUI/PaintGUI.java b/src/GUI/PaintGUI.java
index 7f8e024d960bfaa3001f404bdae4ee55288b7ed0..78265a94fee2eb865f7cc7ce59fb1fe62c0c35dc 100644
--- a/src/GUI/PaintGUI.java
+++ b/src/GUI/PaintGUI.java
@@ -142,13 +142,13 @@ public class PaintGUI extends JPanel {
         toolbox2.add(textSize);
         toolbox2.add(eraserBtn);
         toolbox2.add(eraserSizeOptions);
-        toolbox2.add(clearBtn);
 
 /// File control panel ///
         fileControl.add(newBtn);
         fileControl.add(openBtn);
         fileControl.add(saveBtn);
         fileControl.add(saveAsBtn);
+        fileControl.add(clearBtn);
 
 /// Layout ///
         toolbox.add(toolbox1, BorderLayout.NORTH);
diff --git a/src/client/DrawingUpdate.java b/src/client/DrawingUpdate.java
index c2941d4425815e58a0ac495901b2eb56cdfd68db..0b9d0862ca3198d34761a4591bb1d43a1df2be5f 100644
--- a/src/client/DrawingUpdate.java
+++ b/src/client/DrawingUpdate.java
@@ -20,8 +20,9 @@ public class DrawingUpdate extends UnicastRemoteObject implements IDrawingUpdate
         this.client = client;
     }
 
-    public void notifyUserIsDrawing(String fromClient){
+    public boolean notifyUserIsDrawing(String fromClient) throws RemoteException {
         client.getApplicationMain().getChatScreen().getActiveDrawingUserBox().append(fromClient);
+        return true;
     }
 
     @Override
diff --git a/src/remote/IDrawingUpdate.java b/src/remote/IDrawingUpdate.java
index 73d1d849dbc4380102a52929a0e46c3545749eef..cd066027f26d6395dc372d6f5351c182fc8e6b3e 100644
--- a/src/remote/IDrawingUpdate.java
+++ b/src/remote/IDrawingUpdate.java
@@ -11,5 +11,5 @@ public interface IDrawingUpdate extends Remote, Serializable {
     boolean notifyDraggingDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException;
     boolean notifyCanvasClearance(String fromClient) throws RemoteException;
     boolean receiveImage(byte[] rawImage) throws RemoteException;
-    public void notifyUserIsDrawing(String fromClient) throws RemoteException;
+    boolean notifyUserIsDrawing(String fromClient) throws RemoteException;
 }