diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm
index 5034606256..d543b8b12a 100644
--- a/code/_onclick/hud/movable_screen_objects.dm
+++ b/code/_onclick/hud/movable_screen_objects.dm
@@ -1,3 +1,4 @@
+
 //////////////////////////
 //Movable Screen Objects//
 //   By RemieRichards	//
@@ -30,9 +31,10 @@
 
 	//Split X+Pixel_X up into list(X, Pixel_X)
 	var/list/screen_loc_X = text2list(screen_loc_params[1],":")
-
+	screen_loc_X[1] = encode_screen_X(text2num(screen_loc_X[1]))
 	//Split Y+Pixel_Y up into list(Y, Pixel_Y)
 	var/list/screen_loc_Y = text2list(screen_loc_params[2],":")
+	screen_loc_Y[1] = encode_screen_Y(text2num(screen_loc_Y[1]))
 
 	if(snap2grid) //Discard Pixel Values
 		screen_loc = "[screen_loc_X[1]],[screen_loc_Y[1]]"
@@ -42,8 +44,50 @@
 		var/pix_Y = text2num(screen_loc_Y[2]) - 16
 		screen_loc = "[screen_loc_X[1]]:[pix_X],[screen_loc_Y[1]]:[pix_Y]"
 
-	moved = TRUE
+/obj/screen/movable/proc/encode_screen_X(X)
+	if(X > usr.client.view+1)
+		. = "EAST-[usr.client.view*2 + 1-X]"
+	else if(X < usr.client.view+1)
+		. = "WEST+[X-1]"
+	else
+		. = "CENTER"
 
+/obj/screen/movable/proc/decode_screen_X(X)
+	//Find EAST/WEST implementations
+	if(findtext(X,"EAST-"))
+		var/num = text2num(copytext(X,6)) //Trim EAST-
+		if(!num)
+			num = 0
+		. = usr.client.view*2 + 1 - num
+	else if(findtext(X,"WEST+"))
+		var/num = text2num(copytext(X,6)) //Trim WEST+
+		if(!num)
+			num = 0
+		. = num+1
+	else if(findtext(X,"CENTER"))
+		. = usr.client.view+1
+
+/obj/screen/movable/proc/encode_screen_Y(Y)
+	if(Y > usr.client.view+1)
+		. = "NORTH-[usr.client.view*2 + 1-Y]"
+	else if(Y < usr.client.view+1)
+		. = "SOUTH+[Y-1]"
+	else
+		. = "CENTER"
+
+/obj/screen/movable/proc/decode_screen_Y(Y)
+	if(findtext(Y,"NORTH-"))
+		var/num = text2num(copytext(Y,7)) //Trim NORTH-
+		if(!num)
+			num = 0
+		. = usr.client.view*2 + 1 - num
+	else if(findtext(Y,"SOUTH+"))
+		var/num = text2num(copytext(Y,7)) //Time SOUTH+
+		if(!num)
+			num = 0
+		. = num+1
+	else if(findtext(Y,"CENTER"))
+		. = usr.client.view+1
 
 //Debug procs
 /client/proc/test_movable_UI()
@@ -81,4 +125,4 @@
 
 	S.screen_loc = screen_l
 
-	screen += S
\ No newline at end of file
+	screen += S
diff --git a/code/_onclick/hud/spell_screen_objects.dm b/code/_onclick/hud/spell_screen_objects.dm
index 31f6fbcb86..a59474749a 100644
--- a/code/_onclick/hud/spell_screen_objects.dm
+++ b/code/_onclick/hud/spell_screen_objects.dm
@@ -19,9 +19,12 @@
 	spell_objects.Cut()
 	if(spell_holder)
 		spell_holder.spell_masters -= src
+		if(spell_holder.client && spell_holder.client.screen)
+			spell_holder.client.screen -= src
+		spell_holder = null
 
 /obj/screen/movable/spell_master/ResetVars()
-	..("spell_objects")
+	..("spell_objects", args)
 	spell_objects = list()
 
 /obj/screen/movable/spell_master/MouseDrop()
@@ -47,25 +50,34 @@
 		overlays.len = 0
 		overlays.Add(closed_state)
 	else if(forced_state != 1)
-		var/temp_loc = screen_loc
-
-		var/x_position = text2num(copytext(temp_loc, 1, findtext(temp_loc, ":")))
-		var/x_pix = text2num(copytext(temp_loc, findtext(temp_loc, ":") + 1, findtext(temp_loc, ",")))
-		temp_loc = copytext(temp_loc, findtext(temp_loc, ",") + 1)
-		var/y_position = text2num(copytext(temp_loc, 1, findtext(temp_loc, ":")))
-		var/y_pix = text2num(copytext(temp_loc, findtext(temp_loc, ":")+1))
-
-		for(var/i = 1; i <= spell_objects.len; i++)
-			var/obj/screen/spell/S = spell_objects[i]
-			S.screen_loc = "[x_position + (x_position < 8 ? 1 : -1)*(i%7)]:[x_pix],[y_position + (y_position < 8 ? round(i/7) : -round(i/7))]:[y_pix]"
-			if(spell_holder && spell_holder.client)
-				spell_holder.client.screen += S
-				S.handle_icon_updates = 1
+		open_spellmaster()
 		update_spells(1)
 		showing = 1
 		overlays.len = 0
 		overlays.Add(open_state)
 
+/obj/screen/movable/spell_master/proc/open_spellmaster()
+	var/list/screen_loc_xy = text2list(screen_loc,",")
+
+	//Create list of X offsets
+	var/list/screen_loc_X = text2list(screen_loc_xy[1],":")
+	var/x_position = decode_screen_X(screen_loc_X[1])
+	var/x_pix = screen_loc_X[2]
+
+	//Create list of Y offsets
+	var/list/screen_loc_Y = text2list(screen_loc_xy[2],":")
+	var/y_position = decode_screen_Y(screen_loc_Y[1])
+	var/y_pix = screen_loc_Y[2]
+
+	for(var/i = 1; i <= spell_objects.len; i++)
+		var/obj/screen/spell/S = spell_objects[i]
+		var/xpos = x_position + (x_position < 8 ? 1 : -1)*(i%7)
+		var/ypos = y_position + (y_position < 8 ? round(i/7) : -round(i/7))
+		S.screen_loc = "[encode_screen_X(xpos)]:[x_pix],[encode_screen_Y(ypos)]:[y_pix]"
+		if(spell_holder && spell_holder.client)
+			spell_holder.client.screen += S
+			S.handle_icon_updates = 1
+
 /obj/screen/movable/spell_master/proc/add_spell(var/spell/spell)
 	if(!spell) return
 
@@ -74,13 +86,14 @@
 			return
 		else
 			spell_objects.Add(spell.connected_button)
-			toggle_open(2)
+			if(spell_holder.client)
+				toggle_open(2)
 			return
 
 	if(spell.spell_flags & NO_BUTTON) //no button to add if we don't get one
 		return
 
-	var/obj/screen/spell/newscreen = new /obj/screen/spell
+	var/obj/screen/spell/newscreen = PoolOrNew(/obj/screen/spell)
 	newscreen.spellmaster = src
 	newscreen.spell = spell
 
@@ -96,7 +109,8 @@
 	newscreen.name = spell.name
 	newscreen.update_charge(1)
 	spell_objects.Add(newscreen)
-	toggle_open(2) //forces the icons to refresh on screen
+	if(spell_holder.client)
+		toggle_open(2) //forces the icons to refresh on screen
 
 /obj/screen/movable/spell_master/proc/remove_spell(var/spell/spell)
 	qdel(spell.connected_button)
@@ -151,6 +165,8 @@
 	last_charged_icon = null
 	if(spellmaster)
 		spellmaster.spell_objects -= src
+		if(spellmaster.spell_holder && spellmaster.spell_holder.client)
+			spellmaster.spell_holder.client.screen -= src
 	if(spellmaster && !spellmaster.spell_objects.len)
 		qdel(spellmaster)
 	spellmaster = null