diff --git a/freechat-client/src/init.js b/freechat-client/src/init.js
index 2344d17..0f879b3 100644
--- a/freechat-client/src/init.js
+++ b/freechat-client/src/init.js
@@ -1,21 +1,12 @@
-const { ipcRenderer } = require('electron')
 const $ = require('jquery')
 
-
 // Path is from pages/index.html
 const auth = require('../src/auth.js')
-const { add_to_server_config } = require('../src/settings.js')
 const message = require('../src/messages.js')
+const settings = require('../src/settings.js')
 
 
-$('#add-admin-json').click(async () => { await add_server_to_config() } )
-$('#message-box').on('keypress', async (event) => {
-	if(event.keyCode == 13 && !event.shiftKey ) {
-		await message.send()
-	}
-})
-
-$('#message-btn').on('click', () => console.log('submitting'))
+$('#add-admin-json').click(async () => { await settings.add_server_to_config() } )
 
 auth.init()
 .then(
diff --git a/freechat-client/src/settings.js b/freechat-client/src/settings.js
index d0cb46d..1be94c3 100644
--- a/freechat-client/src/settings.js
+++ b/freechat-client/src/settings.js
@@ -3,14 +3,15 @@ const $ = require('jquery')
 const auth = require('./auth.js')
 
 exports.add_server_to_config = async function() {
-	$('#admin-json-err').text('')
+	$('#admin-json-err').html('<div class="spinner-border" role="status"> <span class="sr-only">Loading...</span> </div>')
+
 	try {
-		const data = JSON.parse($('#admin-json').val())
+		let data = JSON.parse($('#admin-json').val())
 		let config = await ipcRenderer.invoke('config-request')
-		if(!config['servers']) {
-			config['servers'] = []
+		if(!config.data['servers']) {
+			config.data['servers'] = []
 		}
-		config['servers'].push(data)
+		config.data['servers'].push(data)
 
 		await ipcRenderer.invoke('config-update', config)
 
@@ -27,7 +28,7 @@ exports.add_server_to_config = async function() {
 			if(err.name == 'TypeError') {
 				$('#admin-json-err').text("New server config did not have required JSON values to login but was saved")
 			} else {
-				$('#admin-json-err').text("Config parsed but couldn't login")
+				$('#admin-json-err').text("Config saved but couldn't login")
 			}
 		}
 	} catch(err) {