diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe
index 422a6406..2f12d9fa 100644
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 d83935de..4544714a 100644
--- a/EXE/remui/base.rml
+++ b/EXE/remui/base.rml
@@ -100,6 +100,10 @@
         .namefield { display: flex; flex-direction: row; align-items: center; margin-bottom: 8dp; }
         .namefield .label { margin-right: 10dp; }
         .namefield input.text { flex: 1; }
+        .note { border: 1dp #24405c; border-radius: 3dp; background-color: #122033; padding: 8dp 10dp; margin-bottom: 8dp; font-size: 13dp; color: #8197ad; }
+        .note.warn { border-color: #f2b13c; color: #f2b13c; }
+        .coins { font-size: 12dp; color: #8197ad; margin-top: 6dp; }
+        .stats .v.txt { font-family: "Saira SemiCondensed"; font-size: 15dp; white-space: nowrap; overflow: hidden; }
     </style>
 </head>
 <body class="window" data-model="base">
@@ -536,6 +540,7 @@
                         </div>
                     </div>
                     <div class="add" data-action="buy-page">+ Buy a drone</div>
+                    <div class="coins" data-if="coins_text != ''">{{ coins_text }}</div>
                 </div>
 
                 <div class="colm">
@@ -546,13 +551,13 @@
                     </div>
                     <div class="actions" data-if="has_pick">
                         <div class="btn primary" data-action="start">{{ cur_active ? 'Stop' : 'Start' }}<div class="tip">{{ cur_active ? 'Calls the drone back; it waits at its home base.' : 'Sends the drone out from ' + cur_home + '.' }}</div></div>
-                        <div class="btn" data-action="repair">Repair<span class="small" data-if="cur_repair != ''">{{ cur_repair }}</span><div class="tip">Repairs the hull to 100 %. Paid from your credits.</div></div>
-                        <div class="btn" data-action="home">Station here<div class="tip">Makes this base the drone's home; deliveries go into the depot here.</div></div>
+                        <div class="btn" data-class-primary="cur_at_home &amp;&amp; cur_repair != ''" data-action="repair">Repair<span class="small" data-if="cur_repair != ''">{{ cur_repair }}</span><div class="tip">Repairs the hull to 100 % while the drone is at its home base. Paid from your credits.</div></div>
                         <div class="btn danger" data-class-armed="scrap_armed" data-action="scrap">{{ scrap_armed ? 'Really scrap?' : 'Scrap' }}<div class="tip">Scraps the drone for a part of its price. A second click within 3 s confirms.</div></div>
                     </div>
                     <div class="subtabs">
                         <div class="tab" data-class-active="sub == 0" data-action="sub" data-arg="0" data-if="has_pick">Overview</div>
                         <div class="tab" data-class-active="sub == 1" data-action="sub" data-arg="1" data-if="has_pick">Orders</div>
+                        <div class="tab" data-class-active="sub == 3" data-action="sub" data-arg="3" data-if="has_pick">Home</div>
                         <div class="tab" data-class-active="sub == 2" data-action="sub" data-arg="2">Buy</div>
                     </div>
 
@@ -561,10 +566,33 @@
                             <div class="cell"><div class="k">Hull</div><div class="v">{{ cur.hull }} %</div></div>
                             <div class="cell"><div class="k">Cargo</div><div class="v">{{ cur_cargo }}</div></div>
                             <div class="cell"><div class="k">Runs</div><div class="v">{{ cur_runs }}</div></div>
-                            <div class="cell last"><div class="k">Delivered</div><div class="v">{{ cur_delivered }}</div></div>
+                            <div class="cell last"><div class="k">{{ cur_delivered_label }}</div><div class="v">{{ cur_delivered }}</div></div>
+                        </div>
+                        <div class="stats">
+                            <div class="cell"><div class="k">Job</div><div class="v txt">{{ cur_job }}</div></div>
+                            <div class="cell"><div class="k">Now in</div><div class="v txt">{{ cur_where }}</div></div>
+                            <div class="cell"><div class="k">Home base</div><div class="v txt">{{ cur_home }}</div></div>
+                            <div class="cell last"><div class="k">Lost</div><div class="v">{{ cur_losses }}</div></div>
+                        </div>
+                        <div class="note warn" data-if="cur_paused">Paused - above your Drone Control limit. Raise Drone Control on the player window's Skills page or scrap a drone; it works again by itself.</div>
+                        <div class="note" data-class-warn="cur_problem" data-if="!cur_paused &amp;&amp; cur.plan != ''">{{ cur.plan }}</div>
+                    </div>
+
+                    <div class="pane" data-if="has_pick &amp;&amp; sub == 3">
+                        <div class="note">A new home must be a base in the drone's home system. Its runs start and end there; deliveries go into your depot there. Now: {{ cur_home }}</div>
+                        <div class="table">
+                            <div class="head"><span class="c1">Base</span></div>
+                            <div class="body">
+                                <div class="empty" data-if="homes.size == 0">{{ homes_empty }}</div>
+                                <div class="row" data-for="r : homes" data-class-selected="r.selected" data-class-current="r.current" data-action="home-row" data-attr-data-arg="r.key">
+                                    <span class="c1">{{ r.a }}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="actions">
+                            <div class="btn primary" data-if="homes.size &gt; 0" data-action="home-apply">Make home<div class="tip">The picked base becomes the drone's home (from the next run).</div></div>
+                            <div class="btn" data-if="docked" data-action="home">Station here<div class="tip">Makes the base you are docked at the drone's home.</div></div>
                         </div>
-                        <div class="hint">Plan: {{ cur.plan }}</div>
-                        <div class="hint">Home base: {{ cur_home }}</div>
                     </div>
 
                     <div class="pane" data-if="has_pick &amp;&amp; sub == 1">
@@ -604,6 +632,7 @@
                     </div>
 
                     <div class="pane" data-if="sub == 2">
+                        <div class="note warn" data-if="buy_full">{{ limit_text }}</div>
                         <div class="cards">
                             <div class="card" data-for="b, i : buy" data-class-last="i == 2">
                                 <div class="t">{{ b.title }}</div>
@@ -614,6 +643,15 @@
                         </div>
                         <div class="namefield"><span class="label">Name</span><input class="text" type="text" data-value="new_name" maxlength="23"/></div>
                         <div class="hint">The name is given at the purchase and cannot be changed later. Letters, digits and . - _ only.</div>
+                        <div class="table" data-if="buy_depots.size &gt; 0">
+                            <div class="head"><span class="c1">Buy at (your depots)</span><span class="c2">System</span></div>
+                            <div class="body">
+                                <div class="row" data-for="r : buy_depots" data-class-selected="r.selected" data-action="buy-base" data-attr-data-arg="r.key">
+                                    <span class="c1">{{ r.a }}</span><span class="c2">{{ r.b }}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="hint">Bought at: {{ buy_at }}. Paid from your credits.</div>
                         <div class="hint">{{ rules }}</div>
                     </div>
                 </div>