diff --git a/meshuser.js b/meshuser.js
index fe77c374..e09c1bd0 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -4244,7 +4244,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 break;
             }
             case 'uicustomevent': {
-                // Event the change
+                // Event the custom UI action
                 var message = { etype: 'user', userid: user._id, username: user.name, action: 'uicustomevent', domain: domain.id, uisection: command.section, element: command.element  };
                 if (command.selectedDevices != null) { message.selectedDevices = command.selectedDevices; }
                 if (command.src != null) { message.src = command.src; }
diff --git a/views/default.handlebars b/views/default.handlebars
index b0515884..a2193e3b 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -724,13 +724,13 @@
                         <tr>
                             <td class="areaHead" style="line-height:22px">
                                 <div class="toright2">
+                                    <div id="idx_termFullBtn2" onclick=deskToggleFull(event) style="float:right">&nbsp;&#x2716;</div>
                                     <div id="termRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
                                     <input id="termActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() />
                                     <div id="terminalCustomUpperRight" style="float:left;margin-right:6px"></div>
                                     <div id="terminalCustomUiButtons" style="float:left"></div>
                                 </div>
                                 <div>
-                                    <div id="idx_termFullBtn2" onclick=deskToggleFull(event)>&nbsp;&#x2716;</div>
                                     <input type="button" id="autoconnectbutton2" value="AutoConnect" onclick=autoConnectTerminal(event) onkeypress="return false" onkeydown="return false" style="display:none" /><span id="connectbutton2span" style="margin-right:4px"><input type="button" id="connectbutton2" cmenu="termConnectButton" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span><span id="connectbutton2hspan" style="margin-right:4px"><input type="button" id="connectbutton2h" value="HW Connect" title="Connect using Intel&reg; AMT hardware KVM" onclick=connectTerminal(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span><span id="disconnectbutton2span" style="margin-right:4px"><input type="button" id="disconnectbutton2" value="Disconnect" onclick=connectTerminal(event,0) onkeypress="return false" onkeydown="return false" /></span>
                                     <span id="termstatus" style="line-height:22px">Disconnected</span><span id="termtitle"></span>
                                 </div>