diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe
index bc2372b4..083d2cd6 100755
Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ
diff --git a/EXE/remui/base.rml b/EXE/remui/base.rml
index 63a94b93..8f81c341 100644
--- a/EXE/remui/base.rml
+++ b/EXE/remui/base.rml
@@ -330,6 +330,10 @@
                     <div><div class="t">{{ sys_title }}</div><div class="hint">{{ sys_line }}</div></div>
                     <div class="actions sys-claim" data-if="sys_can_claim"><div class="btn primary" data-action="claim">{{ claim_text }}<div class="tip">Claims this system for you, for good. You can build here then.</div></div></div>
                 </div>
+                <div class="panel" data-if="sys_can_name">
+                    <div class="namefield"><span class="label">Name this system</span><input class="text" type="text" data-value="sys_name_in" maxlength="24"/></div>
+                    <div class="actions"><div class="btn primary" data-action="sys-name">Give the name<div class="tip">The discoverer or the owner names it, once. A named system stays for good.</div></div></div>
+                </div>
                 <div class="subtabs">
                     <div class="tab" data-class-active="sys_sub == 0" data-action="sys-sub" data-arg="0">Build</div>
                     <div class="tab" data-class-active="sys_sub == 1" data-action="sys-sub" data-arg="1">Objects</div>
diff --git a/EXE/remui/navmap.rml b/EXE/remui/navmap.rml
index 9d2b4105..2dd54994 100644
--- a/EXE/remui/navmap.rml
+++ b/EXE/remui/navmap.rml
@@ -143,7 +143,6 @@
                     <div class="sysname">{{ system }}</div>
                     <div class="tbar">
                         <div class="btn" data-class-primary="universe" data-action="tool" data-arg="universe">Universe</div>
-                        <div class="btn" data-if="has_uncharted" data-class-primary="uncharted" data-action="tool" data-arg="uncharted">Uncharted</div>
                         <div class="btn" data-action="tool" data-arg="myship">My system</div>
                         <div class="btn" data-class-primary="labels" data-action="labels">Names</div>
                         <div class="btn" data-action="tool" data-arg="clearall">Clear waypoints</div>
@@ -167,6 +166,10 @@
                         <div class="hint" style="padding: 6dp;" data-if="results.size == 0">Nothing on this map by that name.</div>
                         <div class="hit" data-for="r : results" data-action="result" data-attr-data-arg="r.key"><span class="hn">{{ r.name }}</span><span class="hk">{{ r.kind }}</span></div>
                     </div>
+                    <div class="marks" data-if="universe &amp;&amp; uncharted_list.size &gt; 0 &amp;&amp; search == ''">
+                        <h3>Known uncharted systems</h3>
+                        <div class="hit" data-for="u : uncharted_list"><span class="hn">{{ u.name }}</span><span class="hk">{{ u.kind }}</span></div>
+                    </div>
                     <div class="marks" data-if="bookmarks.size &gt; 0 &amp;&amp; search == ''">
                         <h3>Bookmarks</h3>
                         <div class="hit" data-for="b : bookmarks" data-action="gomark" data-ctx="mark" data-attr-data-arg="b.key"><span class="hn">{{ b.name }}</span><span class="mk" data-action="mark_lock" data-attr-data-arg="b.key">{{ b.kind == 'locked' ? 'Unlock' : 'Lock' }}<span class="tip">{{ b.kind == 'locked' ? 'Locked: it can be neither moved nor deleted. Click to unlock.' : 'Lock it in place: no moving, no deleting.' }}</span></span><span class="mk del" data-if="b.kind != 'locked'" data-action="mark_del" data-attr-data-arg="b.key">&#215;</span></div>