diff --git a/src/store/index.tsx b/src/store/index.tsx
index bad1ba0..7bb6e9d 100644
--- a/src/store/index.tsx
+++ b/src/store/index.tsx
@@ -98,13 +98,14 @@ class RootStore {
   }
 
   @action
-  removeAllMessages() {
+  removeAllMessages(cb: () => void) {
     if (
       (window as any).confirm('Remove all messages? (This cannot be undone)')
     ) {
       sendMainMessage('remove-all-messages');
-      (window as any).alert('Messages successfully removed');
       this.messages = [];
+      cb();
+      this.addNotification('Messages successfully removed');
     }
   }
 
diff --git a/src/views/Chat.tsx b/src/views/Chat.tsx
index eba44f5..f1298fe 100644
--- a/src/views/Chat.tsx
+++ b/src/views/Chat.tsx
@@ -141,8 +141,6 @@ const ChatView: FunctionComponent<ChatProps> = (props) => {
       if (pmessage.type === 'relaunch-message') {
         chatState.selectionIsChecked = true;
 
-        console.log(pmessage.payload.selection);
-
         store.selection = pmessage.payload.selection || {};
 
         if (store.selectionCount) {
diff --git a/src/views/Settings.tsx b/src/views/Settings.tsx
index e445a34..72ece68 100644
--- a/src/views/Settings.tsx
+++ b/src/views/Settings.tsx
@@ -87,7 +87,7 @@ const SettingsView: FunctionComponent<SettingsProps> = (props) => {
           <input
             type="text"
             value={settings.name}
-            onBlur={() => saveSettings()}
+            onBlur={() => saveSettings(false)}
             onChange={({ target }: any) =>
               (settings.name = target.value.substr(0, 20))
             }
@@ -103,7 +103,7 @@ const SettingsView: FunctionComponent<SettingsProps> = (props) => {
               checked={settings.enableNotificationTooltip}
               onChange={() => {
                 settings.enableNotificationTooltip = !settings.enableNotificationTooltip;
-                saveSettings();
+                saveSettings(false);
               }}
             />
           </Checkboxes>
@@ -137,7 +137,7 @@ const SettingsView: FunctionComponent<SettingsProps> = (props) => {
         <div className="delete-history">
           <button
             type="submit"
-            onClick={store.removeAllMessages}
+            onClick={() => store.removeAllMessages(() => saveSettings(true))}
             className="button button--secondary"
           >
             Delete history
@@ -214,6 +214,9 @@ const Settings = styled.div`
     color: #fff;
     padding: 5px 4px;
     outline: none;
+    &::placeholder {
+      color: #fff;
+    }
   }
   .fields {
     margin-bottom: 20px;
diff --git a/src/views/UserList.tsx b/src/views/UserList.tsx
index 928d7b4..90fd5e0 100644
--- a/src/views/UserList.tsx
+++ b/src/views/UserList.tsx
@@ -4,6 +4,7 @@ import Header from '../components/Header';
 // store
 import { observer } from 'mobx-react';
 import { useStore } from '../store';
+
 const UserListView: FunctionComponent = () => {
   const store = useStore();