diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm
index 275b038277e..de8e47c9c64 100644
--- a/code/WorkInProgress/Mini/atmos_control.dm
+++ b/code/WorkInProgress/Mini/atmos_control.dm
@@ -64,11 +64,15 @@
 	for(var/obj/machinery/alarm/alarm in sortAtom(alarm_list))
 		if(!is_in_filter(alarm.alarm_area.type))
 			continue // NO ACCESS 4 U
-
+		var/turf/pos = get_turf(alarm)
 		var/list/alarm_data=list()
 		alarm_data["ID"]="\ref[alarm]"
 		alarm_data["danger"] = max(alarm.local_danger_level, alarm.alarm_area.atmosalm-1)
 		alarm_data["name"] = "[alarm]"
+		alarm_data["area"] = get_area(alarm)
+		alarm_data["x"] = pos.x
+		alarm_data["y"] = pos.y
+		alarm_data["z"] = pos.z
 		alarms+=list(alarm_data)
 	data["alarms"]=alarms
 
@@ -77,9 +81,17 @@
 
 	if (!ui)
 		// the ui does not exist, so we'll create a new one
-		ui = new(user, src, ui_key, "atmos_control.tmpl", name, 550, 410)
+		ui = new(user, src, ui_key, "atmos_control.tmpl", name, 900, 800)
+		// adding a template with the key "mapContent" enables the map ui functionality
+		ui.add_template("mapContent", "atmos_control_map_content.tmpl")
+		// adding a template with the key "mapHeader" replaces the map header content
+		ui.add_template("mapHeader", "atmos_control_map_header.tmpl")
 		// When the UI is first opened this is the data it will use
+		// we want to show the map by default
+		ui.set_show_map(1)
+
 		ui.set_initial_data(data)
+
 		ui.open()
 		// Auto update every Master Controller tick
 		if(current)
diff --git a/nano/css/icons.css b/nano/css/icons.css
index f3e207e63e5..c933b14529a 100644
--- a/nano/css/icons.css
+++ b/nano/css/icons.css
@@ -241,6 +241,21 @@
     background-image: url(uiIcons16Red.png);
 }
 
+.mapIcon16.bad {
+    background-image: url(uiIcons16Red.png);
+}
+
+.mapIcon16.average {
+    background-image: url(uiIcons16Orange.png);
+}
+
+.mapIcon16.good {
+    background-image: url(uiIcons16Green.png);
+}
+
+/* AirAlarm */
+.mapIcon16.icon-airalarm { background-position: 0 -144px; }
+
 /* Command Positions */
 .mapIcon16.rank-captain {
     background-position: -224px -112px;
diff --git a/nano/css/shared.css b/nano/css/shared.css
index 632e76b6996..4614c7087e7 100644
--- a/nano/css/shared.css
+++ b/nano/css/shared.css
@@ -543,6 +543,14 @@ th.misc {
     color: green;
 }
 
+.toxin_light {
+    color: #3ADF00;
+}
+
 .oxyloss {
     color: blue;
+}
+
+.oxyloss_light {
+    color: #6698FF;
 }
\ No newline at end of file
diff --git a/nano/images/uiIcons16Orange.png b/nano/images/uiIcons16Orange.png
new file mode 100644
index 00000000000..9dc8e1a0f45
Binary files /dev/null and b/nano/images/uiIcons16Orange.png differ
diff --git a/nano/js/nano_base_helpers.js b/nano/js/nano_base_helpers.js
index dd7fa1b283c..2f17d5b39e2 100644
--- a/nano/js/nano_base_helpers.js
+++ b/nano/js/nano_base_helpers.js
@@ -145,6 +145,41 @@ NanoBaseHelpers = function ()
 				if(level==1) return 'average';
 				return 'bad';
 			},
+			dangerToSpan: function(level) {
+				if(level==0) return '"<span class="good">Good</span>"';
+				if(level==1) return '"<span class="average">Minor Alert</span>"';
+				return '"<span class="bad">Major Alert</span>"';
+			},
+			generateHref: function (parameters) {
+				var body = $('body'); // We store data in the body tag, it's as good a place as any
+				_urlParameters = body.data('urlParameters');
+				var queryString = '?';
+	
+				for (var key in _urlParameters)
+				{
+					if (_urlParameters.hasOwnProperty(key))
+					{
+						if (queryString !== '?')
+						{
+							queryString += ';';
+						}
+						queryString += key + '=' + _urlParameters[key];
+					}
+				}
+
+				for (var key in parameters)
+				{
+					if (parameters.hasOwnProperty(key))
+					{
+						if (queryString !== '?')
+						{
+							queryString += ';';
+						}
+						queryString += key + '=' + parameters[key];
+					}
+				}
+				return queryString;
+			},
 			// Display DNA Blocks (for the DNA Modifier UI)
 			displayDNABlocks: function(dnaString, selectedBlock, selectedSubblock, blockSize, paramKey) {
 			    if (!dnaString)
diff --git a/nano/templates/atmos_control.tmpl b/nano/templates/atmos_control.tmpl
index 47651211132..618cff08e4f 100644
--- a/nano/templates/atmos_control.tmpl
+++ b/nano/templates/atmos_control.tmpl
@@ -16,6 +16,7 @@ Used In File(s): /code/game/machinery/alarm.dm
 #define AALARM_SCREEN_MODE		4
 #define AALARM_SCREEN_SENSORS	5
 -->
+{{:helper.link('Show Tracker Map', 'pin-s', {'showMap' : 1})}}
 {{if !data.alarm}}
 	<h3>Atmospherics Control</h3>
 	<div class="statusDisplay">
diff --git a/nano/templates/atmos_control_map_content.tmpl b/nano/templates/atmos_control_map_content.tmpl
new file mode 100644
index 00000000000..7163aef4515
--- /dev/null
+++ b/nano/templates/atmos_control_map_content.tmpl
@@ -0,0 +1,13 @@
+<!--
+Title: Atmos Control (Map content)
+Used In File(s): \code\workinprogress\mini\atmos_control.dm
+ -->
+{{for data.alarms}}
+	{{if value.z == 1}}
+		<div class="mapIcon mapIcon16 icon-airalarm {{:helper.dangerToClass(value.danger)}}" style="left: {{:(value.x)}}px; bottom: {{:(value.y)}}px;" unselectable="on">
+			<div class="tooltip hidden">
+				{{:value.name}} ({{:helper.dangerToSpan(value.danger)}} {{:value.area}}: {{:value.x}}, {{:value.y}})
+			</div>
+		</div>
+	{{/if}}
+{{/for}}
\ No newline at end of file
diff --git a/nano/templates/atmos_control_map_header.tmpl b/nano/templates/atmos_control_map_header.tmpl
new file mode 100644
index 00000000000..db62ffaa57f
--- /dev/null
+++ b/nano/templates/atmos_control_map_header.tmpl
@@ -0,0 +1,12 @@
+<!--
+Title: Atmos Control (Map content)
+Used In File(s): \code\workinprogress\mini\atmos_control.dm
+ -->
+{{:helper.link('Show Detail List', 'script', {'showMap' : 0})}}
+<div style="float: right; width: 240px;">
+    <span style="float: left;">Zoom Level:&nbsp;</span>
+    <div unselectable="on" class="link zoomLink" data-zoom-level="4">x1.0</div>
+    <div unselectable="on" class="link zoomLink" data-zoom-level="6">x1.5</div>
+    <div unselectable="on" class="link zoomLink" data-zoom-level="8">x2.0</div>
+    <div unselectable="on" class="link zoomLink" data-zoom-level="12">x2.5</div>
+</div>
\ No newline at end of file
diff --git a/nano/templates/crew_monitor.tmpl b/nano/templates/crew_monitor.tmpl
index db3e5673b47..babd0a85494 100644
--- a/nano/templates/crew_monitor.tmpl
+++ b/nano/templates/crew_monitor.tmpl
@@ -8,9 +8,9 @@ Used In File(s): \code\game\machinery\computer\crew.dm
 		{{if value.sensor_type == 1}}
 			<tr><td>{{:value.name}}</td><td>{{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}}</td><td><span class="neutral">Not Available</span></td></tr>
 		{{else value.sensor_type == 2}}
-			<tr><td>{{:value.name}}</td><td>{{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}} (<span class="oxyloss">{{:value.oxy}}</span>/<span class="toxin">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>)</td><td><span class="neutral">Not Available</td></td></tr>
+			<tr><td>{{:value.name}}</td><td>{{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}} (<span class="oxyloss_light">{{:value.oxy}}</span>/<span class="toxin_light">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>)</td><td><span class="neutral">Not Available</td></td></tr>
 		{{else value.sensor_type == 3}}
-			<tr><td>{{:value.name}}</td><td>{{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}} (<span class="oxyloss">{{:value.oxy}}</span>/<span class="toxin">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>)</td><td>{{:value.area}}({{:value.x}}, {{:value.y}})</td></tr>
+			<tr><td>{{:value.name}}</td><td>{{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}} (<span class="oxyloss_light">{{:value.oxy}}</span>/<span class="toxin_light">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>)</td><td>{{:value.area}}({{:value.x}}, {{:value.y}})</td></tr>
 		{{/if}}
 	{{/for}}
 </tbody></table>
\ No newline at end of file
diff --git a/nano/templates/crew_monitor_map_content.tmpl b/nano/templates/crew_monitor_map_content.tmpl
index 1a04f3fe9fb..ceacce23659 100644
--- a/nano/templates/crew_monitor_map_content.tmpl
+++ b/nano/templates/crew_monitor_map_content.tmpl
@@ -6,7 +6,7 @@ Used In File(s): \code\game\machinery\computer\crew.dm
     {{if value.sensor_type == 3}}
         <div class="mapIcon mapIcon16 rank-{{:value.rank.ckey()}} {{:value.dead ? 'dead' : 'alive'}}" style="left: {{:(value.x)}}px; bottom: {{:(value.y)}}px;" unselectable="on">
             <div class="tooltip hidden">
-                {{:value.name}} ({{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}}) (<span class="oxyloss">{{:value.oxy}}</span>/<span class="toxin">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>) ({{:value.area}}: {{:value.x}}, {{:value.y}})
+                {{:value.name}} ({{:value.dead ? "<span class='bad'>Deceased</span>" : "<span class='good'>Living</span>"}}) (<span class="oxyloss_light">{{:value.oxy}}</span>/<span class="toxin_light">{{:value.tox}}</span>/<span class="burn">{{:value.fire}}</span>/<span class="brute">{{:value.brute}}</span>) ({{:value.area}}: {{:value.x}}, {{:value.y}})
             </div>
         </div>
     {{/if}}