diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 8e4afb74..5032ffae 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -126,7 +126,7 @@
 				observer.loc = O.loc
 				observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly.
 
-				client.prefs.update_preview_icon()
+				client.prefs.update_preview_icon(1)
 				observer.icon = client.prefs.preview_icon
 				observer.alpha = 127
 
@@ -502,4 +502,4 @@
 
 //be on the safe side
 /mob/new_player/float()
-	return 0
\ No newline at end of file
+	return 0
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 5db2878a..cd5d7ab2 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -193,21 +193,24 @@ datum/preferences
 			job_type="DEFAULT"
 			job_index=1
 		return list(job_type,job_index)
-		
-	proc/update_preview_icon() //this is a little better - jf
+
+	proc/update_preview_icon(var/rem_floor = 0) //this is a little better - jf
 		del(preview_icon_front)
 		del(preview_icon_side)
 		del(preview_icon)
 		var/datum/species/current_species = all_species[species]
 		if(!current_species) // no species? no preview for you
 			return
-		preview_icon = new/icon("icons/turf/floors.dmi","floor")		
-		preview_icon.Blend(current_species.create_body_preview_icon(src),ICON_OVERLAY) // create the body icon
+		if(!rem_floor)
+			preview_icon = new/icon("icons/turf/floors.dmi","floor")
+			preview_icon.Blend(current_species.create_body_preview_icon(src),ICON_OVERLAY) // create the body icon
+		else
+			preview_icon = new/icon(current_species.create_body_preview_icon(src),ICON_OVERLAY) // create the body icon
 		if(disabilities & NEARSIGHTED)
 			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
 		if (current_species.flags & HAS_UNDERWEAR) // do we even need to handle underwear?
 			if(underwear > 0 && underwear < 7)
-				preview_icon.Blend(new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "underwear[underwear]_[(gender==FEMALE) ? "f" : "m"]_s"),ICON_OVERLAY)			
+				preview_icon.Blend(new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "underwear[underwear]_[(gender==FEMALE) ? "f" : "m"]_s"),ICON_OVERLAY)
 			if(undershirt > 0 && undershirt < 16)
 				preview_icon.Blend(new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = "undershirt[undershirt]_s"),ICON_OVERLAY)
 		var/list/job_types=job_type_info()
@@ -215,4 +218,4 @@ datum/preferences
 		if(istype(current_job))
 			preview_icon.Blend(current_job.create_clothes_icon(backbag), ICON_OVERLAY)
 		preview_icon_front = new(preview_icon, dir = SOUTH)
-		preview_icon_side = new(preview_icon, dir = WEST)
\ No newline at end of file
+		preview_icon_side = new(preview_icon, dir = WEST)
diff --git a/html/changelog.html b/html/changelog.html
index 1ee44378..310b7e7d 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -68,6 +68,7 @@ should be listed in the changelog upon commit though. Thanks. -->
         <li class='tweak'>Borgs now require a camera module to be installed in the head, instead of two flashes</li>
         <li class='tweak'>Adding a law computer to a borg's head makes a borg, not adding one makes an IPC/Shell</li>
 		<li class='tweak'>Sprite backend code</li>
+		<li class='tweak'>Crew monitoring computer NanoUI map to latest version</li>
 	</ul>
 </div>
 
diff --git a/nano/images/nanomap_z1.png b/nano/images/nanomap_z1.png
index 87f544ca..abfcf120 100644
Binary files a/nano/images/nanomap_z1.png and b/nano/images/nanomap_z1.png differ