Web application with updated CSS.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.3.2-q",
+  "version": "0.3.2-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",

views/default.handlebars

@@ -53,7 +53,6 @@
     <!-- main page -->
     <div id=container>
         <div id="notifiyBox" class="notifiyBox" style="display:none"></div>
-        <div id=mastheadx></div>
         <div id=masthead class=noselect>
             <div class="title">{{{title}}}</div>
             <div class="title2">{{{title2}}}</div>
@@ -83,12 +82,16 @@
                 <div class="lb6"></div>
             </div>
         </div>
-        <div id="page_content">
-            <div id=topbarmaster>
         <div id=topbar class=noselect>
             <div>
                 <div style="position:relative">
-                            <div id=toggle title="Toggle full width" onclick="toggleFullScreen(1)">&harr;</div>
+                    <div id=uiMenuButton title="User interface selection" onclick="showUserInterfaceSelectMenu()">&diams;
+                        <div id=uiMenu style="display:none">
+                            <div id=uiViewButton1 class=uiSelector onclick=userInterfaceSelectMenu(1) title="Left bar interface"><div class="uiSelector1"></div></div>
+                            <div id=uiViewButton2 class=uiSelector onclick=userInterfaceSelectMenu(2) title="Top bar interface"><div class="uiSelector2"></div></div>
+                            <div id=uiViewButton3 class=uiSelector onclick=userInterfaceSelectMenu(3) title="Fixed width interface"><div class="uiSelector3"></div></div>
+                        </div>
+                    </div>
                     <table id=MainMenuSpan cellpadding=0 cellspacing=0 class=style1>
                         <tr>
                             <td id=MainMenuMyDevices class="topbar_td style3x" onclick=go(1)>My Devices</td>
@@ -143,13 +146,12 @@
                     </div>
                     <div id=UserDummyMenuSpan>
                         <table id=UserDummyMenu cellpadding=0 cellspacing=0 class=style1>
-                                    <tr><td class=style3 style="text-align:right;height:24px">&nbsp;</td></tr>
+                            <tr><td class=style3 style="">&nbsp;</td></tr>
                         </table>
                     </div>
                 </div>
             </div>
         </div>
-            </div>
         <div id="column_l">
             <div id=p0 style="display:none">
                 <div id=p0message><span id=p0span>Server disconnected</span>, <href onclick=reload() style=cursor:pointer><u>click to reconnect</u></href>.</div>
@@ -253,7 +255,7 @@
                 </div>
                 <div id="p2AccountActions">
                     <p><strong>Account actions</strong></p>
-                        <p style="margin-left:40px">
+                    <p class="mL">
                         <span id="verifyEmailId" style="display:none"><a onclick="account_showVerifyEmail()">Verify email</a><br /></span>
                         <a onclick="account_showChangeEmail()">Change email address</a><br />
                         <a onclick="account_showChangePassword()">Change password</a><span id="p2nextPasswordUpdateTime"></span><br />
@@ -272,9 +274,9 @@
                 <h1>My Events</h1>
                 <table class="pTable">
                     <tr>
-                            <td class=h1></td>
+                        <td class="h1"></td>
-                            <td>&nbsp;<input id=p2deleteall type=button onclick=showDeleteAllEventsDialog() style="display:none" value="Delete All..." /></td>
+                        <td>&nbsp;<input id="p2deleteall" type=button onclick=showDeleteAllEventsDialog() style="display:none" value="Delete All..." /></td>
-                            <td class=auto-style1>
+                        <td class="auto-style1">
                             Show
                             <select id=p3limitdropdown onchange=refreshEvents()>
                                 <option value=60>Last 60</option>
@@ -284,7 +286,7 @@
                                 <option value=1000>Last 1000</option>
                             </select>
                         </td>
-                            <td class=h2></td>
+                        <td class="h2"></td>
                     </tr>
                 </table>
                 <div id=p3events style=""></div>
@@ -293,8 +295,8 @@
                 <h1>My Users</h1>
                 <table class="pTable">
                     <tr>
-                            <td class=h1></td>
+                        <td class="h1"></td>
-                            <td class=style14>
+                        <td class="style14">
                             <div style="float:right">
                                 <input type=button onclick=showUserBroadcastDialog() style=margin-right:6px value="Broadcast" />
                             </div>
@@ -303,14 +305,14 @@
                                 <input id=UserSearchInput type=text style=width:120px;margin-left:6px placeholder=Filter onchange=onUserSearchInputChanged() onkeyup=onUserSearchInputChanged() autocomplete=off onfocus=onUserSearchFocus(1) onblur=onUserSearchFocus(0) />
                             </div>
                         </td>
-                            <td class=h2></td>
+                        <td class="h2"></td>
                     </tr>
                 </table>
                 <div id="p3users"></div>
             </div>
             <div id=p5 style="display:none">
                 <h1>My Files</h1>
-                    <table id="p5toolbar" style="width:100%" cellpadding="0" cellspacing="0">
+                <table id="p5toolbar" cellpadding="0" cellspacing="0">
                     <tr>
                         <td id="p5filehead" valign=bottom>
                             <div id="p5rightOfButtons"></div>
@@ -351,7 +353,7 @@
                         <input type=submit id=p5fileCatchAllSubmit style="display:none" />
                     </form>
                     -->
-                        <div id="p5PublicShare" style=""><div style="padding:4px">These files are shared publicly, click "link" to get public url.</div></div>
+                    <div id="p5PublicShare" style=""><div>These files are shared publicly, click "link" to get public url.</div></div>
                     <div id="bigok" style="display:none"><b>&checkmark;</b></div>
                     <div id="bigfail" style="display:none"><b>&#10007;</b></div>
                     <span id="p5files"></span>
@@ -363,13 +365,15 @@
             <div id=p6 style="display:none">
                 <img id=MainMeshImage src="serverpic.ashx">
                 <h1>My Server</h1>
-                    <p id="p2ServerActions"><strong>Server actions</strong></p>
+                <div id="p2ServerActions">
-                    <p style="margin-left:40px">
+                    <p><strong>Server actions</strong></p>
+                    <div class="mL">
                         <div id="p2ServerActionsBackup"><a href="/backup.zip" rel="noreferrer noopener" target="_blank">Download server backup</a></div>
                         <div id="p2ServerActionsRestore"><a onclick="server_showRestoreDlg()">Restore server with backup</a></div>
                         <div id="p2ServerActionsVersion"><a onclick="server_showVersionDlg()">Check server version</a></div>
                         <div id="p2ServerActionsErrors"><a onclick="server_showErrorsDlg()">Show server error log</a></div>
-                    </p>
+                    </div>
+                </div>
                 <br /><strong>Server Statistics</strong><br /><br />
                 <div id="serverStats">
                     <div id="serverCpuChartView" style="display:none">
@@ -419,36 +423,33 @@
                     <div class="icon2"></div>
                     <div class="warningbox">Remote computer is not powered on, click here to issue a power command.</div>
                 </div>
-                    <table id=deskarea0 cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
+                
-                        <tr id=deskarea1>
+                <div id=deskarea0 cellpadding=0 cellspacing=0>
-                            <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
+                    <div id=deskarea1 class="areaHead">
-                                <div style="float:right;text-align:right">
+                        <div class="toright2">
                             <span id="p14power"></span>&nbsp;
-                                    <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
+                            <div class='deskareaicon' title="Toggle Aspect Ratio" onclick="toggleAspectRatio(1)">&#8690;</div>
-                                    <div style='cursor:pointer;border:none;float:right;font-size:130%;margin-right:4px' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
+                            <div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
+                            <div class='deskareaicon' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
                             <input id="deskFocusBtn" type="button" title="Toggle focus mode, when active only the region around the mouse is updated" onkeypress="return false" onkeydown="return false" value="Focus All" onclick="deskToggleFocus()" style="margin-right:3px;display:none">
-                                    <input id="deskSaveBtn" type="button" title="Save a screenshot of the remote desktop" onkeypress="return false" onkeydown="return false" value="Save..." onclick=deskSaveImage() style=margin-right:3px>
+                            <input id="deskSaveBtn" type="button" title="Save a screenshot of the remote desktop" onkeypress="return false" onkeydown="return false" value="Save..." onclick=deskSaveImage() class="mR">
-                                    <input id="deskActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
+                            <input id="deskActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() class="mR" />
-                                    <input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" style="margin-right:3px">
+                            <input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR">
-                                    <input type="button" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="margin-right:3px;display:none">
+                            <input type="button" title="Change the power state of the remote machine" onkeypress="return false" onkeydown="return false" value="Power Actions..." onclick="showPowerActionDlg()" style="display:none">
                         </div>
                         <div>
                             <div id="idx_deskFullBtn2" onclick=deskToggleFull(event)>&nbsp;&#x2716;</div>
                             <input type="button" id="autoconnectbutton1" value="AutoConnect" onclick=autoConnectDesktop(event) onkeypress="return false" onkeydown="return false" style="display:none">
-                                    <span id=connectbutton1span>&nbsp;<input type=button id=connectbutton1 value="Connect" onclick=connectDesktop(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
+                            <span id=connectbutton1span><input type=button id=connectbutton1 value="Connect" onclick=connectDesktop(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
                             <span id=connectbutton1hspan>&nbsp;<input type=button id=connectbutton1h value="HW Connect" onclick=connectDesktop(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
                             <span id=disconnectbutton1span>&nbsp;<input type=button id=disconnectbutton1 value="Disconnect" onclick=connectDesktop(event,0) onkeypress="return false" onkeydown="return false"></span>
                             &nbsp;<span id="deskstatus">Disconnected</span>
                         </div>
-                            </td>
+                    </div>
-                        </tr>
+                    <div id=deskarea2 style="">
-                        <tr id=deskarea2>
+                        <div class="areaProgress"><div id="progressbar" style=""></div></div>
-                            <td>
+                    </div>
-                                <div style=background-color:gray><div id=progressbar style=height:2px;width:0%;background-color:red></div></div>
+                    <div id=deskarea3x>
-                            </td>
-                        </tr>
-                        <tr id=deskarea3>
-                            <td id=deskarea3x style="">
                         <div id=DeskFocus oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></div>
                         <div id=DeskParent>
                             <canvas id=Desk width=640 height=480 oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event) onmousewheel=dmousewheel(event)></canvas>
@@ -456,24 +457,24 @@
                         <div id=DeskTools>
                             <a id=DeskToolsRefreshButton style="" onclick="refreshDeskTools()">Refresh</a>
                             <div id=DeskToolsBar>Processes</div>
-                                    <div style="position:absolute;top:26px;left:4px;right:4px;bottom:4px;background-color:lightgray;text-align:left">
+                            <div id=deskToolsArea>
-                                        <div style="border-bottom:1px solid darkgray;padding:3px"><a style=width:50px;padding-right:5px;float:left;cursor:pointer title="Sort by process id" onclick=sortProcess(0)>PID</a><a style=cursor:pointer title="Sort by name" onclick=sortProcess(1)>Name</a></div>
+                                <div id=deskToolsHeader>
+                                    <a class="colmn1" title="Sort by process id" onclick=sortProcess(0)>PID</a>
+                                    <a class="colmn2" title="Sort by name" onclick=sortProcess(1)>Name</a></div>
                                 <div id="DeskToolsProcesses" style=""></div>
                             </div>
                         </div>
-                            </td>
+                    </div>
-                        </tr>
+                    <div id=deskarea4 class="areaFoot">
-                        <tr id=deskarea4>
+                        <div class="toright2">
-                            <td style=padding-top:2px;padding-bottom:2px;background:#C0C0C0>
-                                <div style=float:right;text-align:right>
                             <select id=termdisplays style="display:none" onchange=deskSetDisplay(event) onclick=deskGetDisplayNumbers(event)></select>&nbsp;
                             <input id=DeskToolsButton type=button value=Tools title="Toggle tools view" onkeypress="return false" onkeydown="return false" onclick="toggleDeskTools()">&nbsp;
-                                    <span id=DeskChatButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open chat window to this computer"><img src='images/icon-chat.png' onclick=deviceChat() height=16 width=16 style=padding-top:2px /></span>
+                            <span id=DeskChatButton class="deskarea" title="Open chat window to this computer"><img src='images/icon-chat.png' onclick=deviceChat() height=16 width=16 style=padding-top:2px /></span>
-                                    <span id=DeskNotifyButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Display a notification on the remote computer"><img src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
+                            <span id=DeskNotifyButton title="Display a notification on the remote computer"><img src='images/icon-notify.png' onclick=deviceToastFunction() height=16 width=16 style=padding-top:2px /></span>
-                                    <span id=DeskOpenWebButton style="float:right;margin-top:1px;margin-right:4px;cursor:pointer" title="Open a web address on remote computer"><img src='images/icon-url2.png' onclick=deviceUrlFunction() height=16 width=16 style=padding-top:2px /></span>
+                            <span id=DeskOpenWebButton title="Open a web address on remote computer"><img src='images/icon-url2.png' onclick=deviceUrlFunction() height=16 width=16 style=padding-top:2px /></span>
                         </div>
                         <div>
-                                    <select style="margin-left:6px" id="deskkeys">
+                            <select id="deskkeys">
                                 <option value=5>Win</option>
                                 <option value=0>Win+Down</option>
                                 <option value=1>Win+Up</option>
@@ -483,17 +484,16 @@
                                 <option value=6>Win+R</option>
                             </select>
                             <input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
-                                    <input id="DeskClip" style="margin-left:6px;display:none" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
+                            <input id="DeskClip" style="" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
                             <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
-                                    <label><span id="DeskControlSpan" style="margin-left:6px" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>&nbsp;
+                            <label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>&nbsp;
+                        </div>
+                    </div>
                 </div>
-                            </td>
-                        </tr>
-                    </table>
             </div>
             <div id=p12 style="display:none">
                 <div id="p12title">
-                        <div id="p12BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
+                    <div id="p12BackButton"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
                     <h1>Terminal - <span id=p12deviceName></span></h1>
                 </div>
                 <div id="p12warning" onclick=showFeaturesDlg()>
@@ -504,15 +504,15 @@
                     <div class="icon2"></div>
                     <div class="warningbox">Remote computer is not powered on, click here to issue a power command.</div>
                 </div>
-                    <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
+                <table id=termTable cellpadding=0 cellspacing=0>
                     <tr>
-                            <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
+                        <td class="areaHead">
-                                <div style="float:right;text-align:right">
+                            <div class="toright2">
-                                    <input id="termActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
+                                <input id="termActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction()/>
                             </div>
                             <div>
                                 <input type="button" id="autoconnectbutton2" value="AutoConnect" onclick=autoConnectTerminal(event) onkeypress="return false" onkeydown="return false" style="display:none">
-                                    <span id="connectbutton2span">&nbsp;<input type="button" id="connectbutton2" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
+                                <span id="connectbutton2span"><input type="button" id="connectbutton2" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
                                 <span id="connectbutton2hspan">&nbsp;<input type="button" id="connectbutton2h" value="HW Connect" onclick=connectTerminal(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
                                 <span id="disconnectbutton2span">&nbsp;<input type="button" id="disconnectbutton2" value="Disconnect" onclick=connectTerminal(event,0) onkeypress="return false" onkeydown="return false"></span>
                                 &nbsp;<span id="termstatus">Disconnected</span>
@@ -521,23 +521,23 @@
                     </tr>
                     <tr>
                         <td>
-                                <div style="background-color:gray"><div id="termprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
+                            <div class="areaProgress"><div id="termprogressbar" style=""></div></div>
                         </td>
                     </tr>
                     <tr>
-                            <td style="background:black;text-align:center;height:500px;position:relative">
+                        <td id="termarea3x">
-                                <pre id="Term" style="background:black;margin:0;padding:0"></pre>
+                            <pre id="Term"></pre>
                         </td>
                     </tr>
                     <tr>
-                            <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
+                        <td class="areaFoot">
-                                <div style="float:right;text-align:right">
+                            <div class="toright2">
                                 <span id="terminalSettingsButtons" style="display:none">
                                     <input id="id_tcrbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="CR+LF" title="Toggle what the return key will send" onclick="termToggleCr()">
                                     <input id="id_tfxkeysbutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Intel (F10 = ESC+[OM)" title="Toggle F1 to F10 keys emulation type" onclick="termToggleFx()">
                                     <input id="id_ttypebutton" type="button" onkeypress="return false" onkeydown="return false" class="bottombutton" value="Extended Ascii" title="Toggle terminal emulation type" onclick="termToggleType()">
                                 </span>
-                                    <select id="specialkeylist" onkeypress="return false" style="margin-left:5px"></select>
+                                <select id="specialkeylist" onkeypress="return false"></select>
                                 <input id="specialkeylistinput" type="button" onkeypress="return false" class="bottombutton" value="Send" title="Send the selected special key" onclick="sendSpecialKey()" />
                             </div>
                             <div>
@@ -557,11 +557,11 @@
                     <div id="p13BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
                     <h1>Files - <span id=p13deviceName></span></h1>
                 </div>
-                    <table id="p13toolbar" style="width: 100%" cellpadding="0" cellspacing="0">
+                <table id="p13toolbar" cellpadding="0" cellspacing="0">
                     <tr>
-                            <td style="background-color:#C0C0C0;border-bottom:2px solid black;padding:2px">
+                        <td class="areaHead">
-                                <div style="float:right;text-align:right">
+                            <div class="toright2">
-                                    <input id="filesActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() style=margin-right:3px />
+                                <input id="filesActionsBtn" type=button title="Perform power actions on the device" onkeypress="return false" onkeydown="return false" value=Actions onclick=deviceActionFunction() />
                             </div>
                             <div>
                                 <input id=p13AutoConnect value="AutoConnect" onclick=autoConnectFiles(event) onkeypress="return false" onkeydown="return false" type="button" style="display:none">
@@ -571,8 +571,8 @@
                         </td>
                     </tr>
                     <tr>
-                            <td style="width:100%;background-color:#d3d9d6;text-align:left;padding:4px" valign=bottom>
+                        <td class="areaHead2" valign=bottom>
-                                <div id="p13rightOfButtons" style="float:right;margin-top:3px"></div>
+                            <div id="p13rightOfButtons" class="toright2"></div>
                             <div>
                                 <input type=button id=p13FolderUp disabled="disabled" onclick="p13folderup()" value="Up" />&nbsp;
                                 <input type=button id=p13SelectAllButton disabled="disabled" onclick="p13selectallfile()" value="Select All" onkeypress="return false" onkeydown="return false" />&nbsp;
@@ -588,8 +588,8 @@
                         </td>
                     </tr>
                     <tr>
-                            <td style="background-color:#E4E9E7;height:28px">
+                        <td class="areaHead3">
-                                <div style=float:right>
+                            <div class="toright2">
                                 <select id=p13sortdropdown onchange=p13updateFiles()>
                                     <option value=1 selected="selected">Sort by name</option>
                                     <option value=2>Sort by size</option>
@@ -603,49 +603,50 @@
                         </td>
                     </tr>
                 </table>
-                    <div id="p13filetable" style="width:100%;height:calc(100vh - 346px);overflow:auto;-webkit-user-select:none">
+                <div id="p13filetable" style="">
-                        <div id="p13bigok" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&checkmark;</b></div>
+                    <div id="p13bigok" style="display:none"><b>&checkmark;</b></div>
-                        <div id="p13bigfail" style="width:256px;overflow:hidden;position:absolute;left:337px;top:200px;text-align:center;font-size:1600%;color:#AAAAAA;display:none"><b>&#10007;</b></div>
+                    <div id="p13bigfail" style="display:none"><b>&#10007;</b></div>
                     <span id="p13files"></span>
                 </div>
-                    <table id="p13toolbarBottom" style=width:100% cellpadding=0 cellspacing=0>
+                <table id="p13toolbarBottom" cellpadding=0 cellspacing=0>
                     <tr><td class=style6>&nbsp;<span id="p13bottomstatus"></span></td></tr>
                 </table>
             </div>
             <div id=p14 style="display:none">
                 <div id="p14title">
                     <div id="p14BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
+                    <div id="devListToolbarViewIcons"><div class="viewSelector" onclick=deskToggleFull(event) title="Full Screen. Hold shift to browser full screen."><div class="viewSelector5"></div></div></div>
                     <h1>Intel&reg; AMT - <span id=p14deviceName></span></h1>
                 </div>
-                    <iframe id=p14iframe style="width:100%;height:calc(100vh - 242px);border:0;overflow:hidden" src="/commander.htm"></iframe>
+                <iframe id=p14iframe src="/commander.htm"></iframe>
             </div>
             <div id=p15 style="display:none">
                 <div id="p15title">
                     <div id="p15BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
                     <h1><span id=p15deviceName></span></h1>
                 </div>
-                    <table cellpadding=0 cellspacing=0 style="width:100%;padding:0px;padding:0px;margin-top:0px">
+                <table id="consoleTable" cellpadding=0 cellspacing=0>
                     <tr>
-                            <td style=background:#C0C0C0>
+                        <td class="areaHead">
-                                <div style=float:right;padding-right:4px>
+                            <div class="toright2">
-                                    <div style=padding:4px;display:inline-block id=p15coreName title="Information about current core running on this agent"></div>
+                                <div id=p15coreName title="Information about current core running on this agent"></div>
                                 <input type=button id=p15uploadCore value="Agent Action" onclick=p15uploadCore(event) title="Change the agent Java Script code module" />
                             </div>
-                                <div id="p15statetext" style=padding:4px></div>
+                            <div id="p15statetext"></div>
                         </td>
                     </tr>
                     <tr>
                         <td>
-                                <div style="background-color:gray"><div id="consoleprogressbar" style="height:2px;width:0%;background-color:red"></div></div>
+                            <div class="areaProgress"><div id="consoleprogressbar" style=""></div></div>
                         </td>
                     </tr>
                     <tr>
-                            <td id=p15agentConsole style="background:black;margin:0;padding:0;color:lightgray;width:100%;height:calc(100vh - 296px);max-height:500px;position:relative">
+                        <td id=p15agentConsole>
-                                <pre id=p15agentConsoleText style="position:absolute;margin:0;padding:0;top:0;bottom:0;left:0;right:0;overflow-y:scroll;overflow-x:auto"></pre>
+                            <pre id=p15agentConsoleText></pre>
                         </td>
                     </tr>
                     <tr>
-                            <td style="padding-top:2px;padding-bottom:2px;background:#C0C0C0">
+                        <td class="areaFoot">
                             <table style="width:100%">
                                 <tr>
                                     <td style="width:99%">
@@ -664,12 +665,11 @@
                     <div id="p16BackButton" style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
                     <h1>Events - <span id=p16deviceName></span></h1>
                 </div>
-                    <div style="width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px">
+                <table class="pTable">
-                        <div class="h1pre">&nbsp;</div>
+                    <tr>
-                        <div class="h1" style="float:left">&nbsp;</div>
+                        <td class="h1"></td>
-                        <!--<div class=style14 style=height:100%;float:left>&nbsp;&nbsp;<input id=p31deleteall type=button style="display:none" value="Delete All..." />&nbsp;</div>-->
+                        <td>&nbsp;<input type=button onclick=refreshDeviceEvents() value="Refresh" /></td>
-                        <div class="style14" style="float:left">&nbsp;&nbsp;<input type=button value=Refresh onclick=refreshDeviceEvents() />&nbsp;</div>
+                        <td class="auto-style1">
-                        <div class="auto-style1" style="height:100%;float:right">
                             Show
                             <select id=p16limitdropdown onchange=refreshDeviceEvents()>
                                 <option value=60>Last 60</option>
@@ -678,11 +678,11 @@
                                 <option value=500>Last 500</option>
                                 <option value=1000>Last 1000</option>
                             </select>
-                            <div class="h2end"></div>
+                        </td>
-                            <div class="h2" style="height:100%;float:right">&nbsp;</div>
+                        <td class="h2"></td>
-                        </div>
+                    </tr>
-                    </div>
+                </table>
-                    <div id=p16events style="max-height:calc(100vh - 267px);overflow-y:auto"></div>
+                <div id=p16events></div>
             </div>
             <div id=p20 style="display:none">
                 <picture id=MainMeshImage style=border-width:0px;height:200px;width:200px;float:right>
@@ -719,12 +719,11 @@
             <div id=p31 style="display:none">
                 <div style="float:left"><div class="backButton" onclick=goBack() title="Back"><div class="backButtonEx"></div></div></div>
                 <h1>Events - <span id=p31userName></span></h1>
-                    <div style="width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px">
+                <table class="pTable">
-                        <div class="h1pre">&nbsp;</div>
+                    <tr>
-                        <div class="h1" style="height:100%;float:left">&nbsp;</div>
+                        <td class="h1"></td>
-                        <!--<div class=style14 style=float:left>&nbsp;&nbsp;<input id=p31deleteall type=button style="display:none" value="Delete All..." />&nbsp;</div>-->
+                        <td>&nbsp;<input type=button onclick=refreshUsersEvents() value="Refresh" /></td>
-                        <div class="style14" style="float:left">&nbsp;&nbsp;<input type=button value=Refresh onclick=refreshUsersEvents() />&nbsp;</div>
+                        <td class="auto-style1">
-                        <div class="auto-style1" style="height:100%;float:right">
                             Show
                             <select id=p31limitdropdown onchange=refreshUsersEvents()>
                                 <option value=60>Last 60</option>
@@ -733,16 +732,16 @@
                                 <option value=500>Last 500</option>
                                 <option value=1000>Last 1000</option>
                             </select>
-                            <div class="h2end"></div>
+                        </td>
-                            <div class="h2" style="height:100%;float:right;">&nbsp;</div>
+                        <td class="h2"></td>
+                    </tr>
+                </table>
+                <div id=p31events></div>
             </div>
-                    </div>
+            <div id=p40 style="display:none;">
-                    <div id=p31events style="max-height:calc(100vh - 267px);overflow-y:scroll"></div>
-                </div>
-                <div id=p40 style="display:none;height:calc(100vh - 170px)">
                 <h1>My Server Stats</h1>
-                    <div style=width:100%;height:24px;background-color:#d3d9d6;margin-bottom:4px>
+                <div class="areaHead">
-                        <div style="float:right">
+                    <div class="toright2">
                         <select id=p40type onchange=updateServerTimelineStats()>
                             <option value=0>Connections</option>
                             <option value=1>Memory</option>
@@ -757,32 +756,25 @@
                         <img src=images/link4.png height=10 width=10 title="Download data points (.csv)" style=cursor:pointer onclick=p40downloadEvents()>&nbsp;
                     </div>
                     <div>
-                            &nbsp;<input value="Refresh" type="button" onclick="refreshServerTimelineStats()" />
+                        <input value="Refresh" type="button" onclick="refreshServerTimelineStats()" />
                         &nbsp;<input id=p40log type="checkbox" onclick="updateServerTimelineHours()" />Log-X
                     </div>
                 </div>
-                    <canvas id=serverMainStats style="height:calc(100vh - 250px);max-height:calc(100vh - 250px);width:100%"></canvas>
+                <canvas id=serverMainStats style=""></canvas>
             </div>
             <br id="column_l_bottomgap" />
         </div>
-            <div id=footer class=noselect>
+        <div id="footer">
-                <table cellpadding=0 cellspacing=10 style="width:100%">
+            <div class="footer1">{{{footer}}}</div>
-                    <tr>
+            <div class="footer2">
-                        <td style="text-align:left;color:white">
+                <a id="verifyEmailId2" style="display:none" onclick="account_showVerifyEmail()">Verify Email</a>
-                            {{{footer}}}
+                &nbsp;<a href=terms>Terms &amp; Privacy</a>
-                        </td>
+            </div>
-                        <td style="text-align:right">
-                            <a id="verifyEmailId2" style="color:yellow;margin-left:3px;cursor:pointer;display:none" onclick="account_showVerifyEmail()">Verify Email</a>
-                            <a style="margin-left:3px" href="terms">Terms &amp; Privacy</a>
-                        </td>
-                    </tr>
-                </table>
         </div>
         <div id=dialog style="display:none">
             <div id=dialogHeader>
-                    <div id=id_dialogclose style=float:right;padding:3px;margin-right:3px;cursor:pointer onclick=setDialogMode()>&#x2716;</div>
+                <div id=id_dialogclose onclick=setDialogMode()>&#x2716;</div>
-                    <div id=id_dialogtitle style=padding:5px></div>
+                <div id=id_dialogtitle></div>
-                    <div style=width:100%;margin:6px></div>
             </div>
             <div id=dialogBody>
                 <div id=dialog1>
@@ -792,38 +784,38 @@
                     <div id=id_dialogOptions></div>
                 </div>
                 <div id=dialog3 style="">
-                        <div style=height:26px>
+                    <div id=d3upload>
-                            <select id=d3uploadMode style=float:right;width:260px onchange=d3modechange()>
+                        <div>File Selection</div>
+                        <select id=d3uploadMode onchange=d3modechange()>
                             <option value=1>Local file upload</option>
                             <option value=2>Server file selection</option>
                         </select>
-                            <div>File Selection</div>
                     </div>
-                        <div id=d3localmode style=height:26px;display:none>
+                    <div id=d3localmode style="display:none">
+                        <div>Upload File</div>
                         <form id=d3localmodeform method=post enctype=multipart/form-data action=uploadfile.ashx target=fileUploadFrame>
                             <input type=text id=d3attrib name=attrib style="display:none" />
-                                <input type=file id=d3localFile name=files style=float:right;width:260px onchange=d3setActions() />
+                            <input type=file id=d3localFile name=files onchange=d3setActions() />
                             <input type=submit id=d3submit style="display:none" />
                         </form>
-                            <div>Upload File</div>
                     </div>
                     <div id=d3servermode>
-                            <div style="width:100%;background-color:#d3d9d6;text-align:left;padding:3px" valign=bottom>
+                        <div id=d3serveraction valign=bottom>
                             <input type=button id=p3FolderUp disabled="disabled" onclick=d3folderup() value="Up" />&nbsp;
                         </div>
-                            <div id=d3serverfiles style="width:100%;height:150px;background-color:white;padding:2px;border:1px solid gray;overflow-y:scroll"></div>
+                        <div id=d3serverfiles></div>
                     </div>
                 </div>
-                    <div id=dialog7 style="margin:auto;margin:3px">
+                <div id=dialog7 style="">
-                        
                     <div id="d7meshkvm">
-                            <h4 style="width:100%;border-bottom:1px solid gray">Agent Remote Desktop</h4>
+                        <h4>Agent Remote Desktop</h4>
-                            <div style="margin:3px 0 3px 0">
+                        <div>
-                                <select id="d7bitmapquality" style="float:right;width:200px;height:20px" dir="rtl"></select>
+                            <div>Quality</div>
-                                <div style="height:20px">Quality</div>
+                            <select id="d7bitmapquality" dir="rtl"></select>
                         </div>
-                            <div style="margin:3px 0 3px 0">
+                        <div>
-                                <select id="d7bitmapscaling" style="float:right;width:200px;height:20px" dir="rtl">
+                            <div>Scaling</div>
+                            <select id="d7bitmapscaling" style="" dir="rtl">
                                 <option selected=selected value=1024>100%</option>
                                 <option value=896>87.5%</option>
                                 <option value=768>75%</option>
@@ -833,44 +825,43 @@
                                 <option value=256>25%</option>
                                 <option value=128>12.5%</option>
                             </select>
-                                <div style="height:20px">Scaling</div>
                         </div>
-                            <div style="margin:3px 0 3px 0">
+                        <div>
-                                <select id="d7framelimiter" style="float:right;width:200px;height:20px" dir="rtl">
+                            <div>Frame rate</div>
+                            <select id="d7framelimiter" dir="rtl">
                                 <option selected=selected value=50>Fast</option>
                                 <option value=100>Medium</option>
                                 <option value=400>Slow</option>
                                 <option value=1000>Very slow</option>
                             </select>
-                                <div style="height:20px">Frame rate</div>
                         </div>
                     </div>
                     <div id="d7amtkvm">
-                            <h4 style="width:100%;border-bottom:1px solid gray">Intel&reg; AMT Hardware KVM</h4>
+                        <h4>Intel&reg; AMT Hardware KVM</h4>
-                            <div style='height:26px'>
+                        <div>
-                                <select id="d7desktopmode" style="float:right;width:200px">
+                            <div>Image Encoding</div>
+                            <select id="d7desktopmode">
                                 <option value="1">RLE8, Fastest</option>
                                 <option value="2">RLE16, Recommended</option>
                                 <option value="3">RAW8, Slow</option>
                                 <option value="4">RAW16, Very Slow</option>
                             </select>
-                                <div>Image Encoding</div>
                         </div>
-                            <div style="height:60px">
+                        <div>
-                                <div style="float:right;border:1px solid #666;width:200px;height:60px;overflow-y:scroll;background-color:white">
+                            <div>Other Settings</div>
+                            <div id="d7otherset">
                                 <label><input type="checkbox" id='d7showfocus'>Show Focus Tool<br></label>
                                 <label><input type="checkbox" id='d7showcursor'>Show Local Mouse Cursor<br></label>
                                 <label><input type="checkbox" id='d7localKeyMap'>Local Keyboard Map<br></label>
                             </div>
-                                <div>Other Settings</div>
                         </div>
                     </div>
                 </div>
             </div>
-                <div id="idx_dlgButtonBar" style="padding:10px;margin-bottom:4px">
+            <div id="idx_dlgButtonBar">
                 <input id="idx_dlgCancelButton" type="button" value="Cancel" style="" onclick="dialogclose(0)">
                 <input id="idx_dlgOkButton" type="button" value="OK" style="" onclick="dialogclose(1)">
-                    <div style="height:25px"><input id=idx_dlgDeleteButton type=button value=Delete style="display:none" onclick="dialogclose(2)"></div>
+                <div><input id=idx_dlgDeleteButton type=button value=Delete style="display:none" onclick="dialogclose(2)"></div>
             </div>
         </div>
         <iframe name="fileUploadFrame" style="display:none"></iframe>
@@ -878,7 +869,6 @@
         <form style="display:none" method=post action=uploadnodefile.ashx enctype=multipart/form-data target=fileUploadFrame><input id=p13fileDragName name="name"><input id=p13fileDragSize name="size"><input id=p13fileDragType name="type"><input id=p13fileDragData name="data"><input id=p13fileDragLink name="link"><input type=submit id=p13loginSubmit2 style="display:none" /></form>
         <audio id="chimes"><source src="sounds/chimes.mp3" type="audio/mp3"></audio>
     </div>
-    </div>
     <script type="text/javascript">
         'use strict';
         var args;
@@ -921,11 +911,12 @@
         var debugmode = 0;
         var clickOnce = (((features & 256) != 0) && detectClickOnce());
         var attemptWebRTC = ((features & 128) != 0);
-        var webPageFullScreen = getstore('webPageFullScreen', true);
-        if (webPageFullScreen == 'false') { webPageFullScreen = false; }
-        if (webPageFullScreen == 'true') { webPageFullScreen = true; }
         var passRequirements = "{{{passRequirements}}}";
         if (passRequirements != "") { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); }
+        var deskAspectRatio = (getstore('deskAspectRatio', 'false') == 'true');
+        var uiMode = parseInt(getstore('uiMode', 1));
+        var webPageStackMenu = false;
+        var webPageFullScreen = true;
 
         function startup() {
             if ((features & 32) == 0) {
@@ -950,7 +941,7 @@
             if (args.hide) {
                 var hide = parseInt(args.hide);
                 QV('masthead', !(hide & 1));
-                QV('topbarmaster', !(hide & 2));
+                QV('topbar', !(hide & 2));
                 QV('footer', !(hide & 4));
                 QV('p10title', !(hide & 8));
                 QV('p11title', !(hide & 8));
@@ -983,7 +974,7 @@
             document.onkeydown = ondockeydown;
             document.onkeyup = ondockeyup;
             window.onresize = function () { masterUpdate(512); }
-            masterUpdate(512);
+            setTimeout("masterUpdate(512)", 200);
 
             // Connect to the mesh server
             meshserver = MeshServerCreateControl(domainUrl, authCookie);
@@ -1037,6 +1028,49 @@
             // Setup server stats panels
             setupGeneralServerStats();
             setupServerTimelineStats();
+
+            // Setup the user interface in the right mode
+            userInterfaceSelectMenu();
+        }
+
+        // Toggle the web page to full screen
+        function toggleAspectRatio(toggle) {
+            if (toggle === 1) { deskAspectRatio = !deskAspectRatio; putstore('deskAspectRatio', deskAspectRatio); }
+            deskAdjust()
+        }
+        
+        // If FullScreen, toggle menu to be horisontal or vertical
+        function toggleStackMenu(toggle) {
+            if (webPageFullScreen == true) {
+                if (toggle === 1) {
+                    webPageStackMenu = !webPageStackMenu;
+                    putstore('webPageStackMenu', webPageStackMenu); 
+                }
+                if (webPageStackMenu == false) {
+                    QC('body').remove("menu_stack");
+                } else {
+                    QC('body').add("menu_stack");
+                    if (xxcurrentView >= 10) QC('column_l').remove('room4submenu');
+                }
+                deskAdjust();
+            }
+        }
+
+        // Toggle user interface menu
+        function showUserInterfaceSelectMenu() {
+            Q('uiViewButton1').classList.remove('uiSelectorSel');
+            Q('uiViewButton2').classList.remove('uiSelectorSel');
+            Q('uiViewButton3').classList.remove('uiSelectorSel');
+            try { Q('uiViewButton' + uiMode).classList.add('uiSelectorSel'); } catch (ex) {}
+            QV('uiMenu', (QS('uiMenu').display == 'none'));
+        }
+
+        function userInterfaceSelectMenu(s) {
+            if (s) { uiMode = s; putstore('uiMode', uiMode); }
+            webPageFullScreen = (uiMode < 3);
+            webPageStackMenu = (uiMode > 1);
+            toggleFullScreen(0);
+            toggleStackMenu(0);
         }
 
         // Toggle the web page to full screen
@@ -1045,48 +1079,18 @@
             var hide = 0;
             if (args.hide) { hide = parseInt(args.hide); }
             if (webPageFullScreen == false) {
+                QC('body').remove("menu_stack");
                 QC('body').remove("fullscreen");
                 QC('body').remove("arg_hide");
-            /*    QS('container').width = '960px';
+                if (xxcurrentView >= 10) QC('column_l').add('room4submenu');
-                QS('container')['border-right'] = '1px solid #b7b7b7';
-                QS('container')['border-left'] = '1px solid #b7b7b7';
-                QS('container')['min-width'] = '960px';
-                QS('container')['overflow'] = '';
-                QS('column_l').width = '930px';
-                QS('column_l').height = '';
-                QS('column_l')['margin-left'] = '';
-                QS('column_l')["overflow-y"] = '';
-                QS('column_l')["max-height"] = (xxcurrentView >= 10) ? 'calc(100vh - 159px)' : 'calc(100vh - 135px)';
-                QS('container').position = '';
-                QS('page_content').position = ''; 
-                QV('MainMenuSpan', true); */
                 QV('UserDummyMenuSpan', false);
-                QV('page_leftbar', false);
+                //QV('page_leftbar', false);
             } else {
                 QC('body').add("fullscreen");
-                if (hide & 16) QC('body').add("arg_hide");
+                if (hide & 16) QC('body').add("arg_hide"); // This is replacement for QV('page_leftbar', !(hide & 16));
-            /*    QS('container').position = 'absolute';
+                if (xxcurrentView >= 10) QC('column_l').remove('room4submenu');
-                QS('container').width = '100%';
-                QS('container').top = '0px';
-                QS('container').bottom = '0px';
-                QS('container')['border-right'] = '0';
-                QS('container')['border-left'] = '0';
-                QS('container')['min-width'] = '700px';
-                QS('container')['overflow'] = 'hidden';
-                QS('page_content').position = 'absolute';
-                QS('page_content').top = '66px';
-                QS('page_content').left = (hide & 16)?'0px':'90px';
-                QS('page_content').right = '0px';
-                QS('page_content').bottom = '0px';
-                QS('column_l').height = 'calc(100vh - 135px)';
-                QS('column_l').width = 'calc(100% - 30px)';
-                QS('column_l')["overflow-y"] = 'auto';
-                QS('column_l')["max-height"] = 'calc(100vh - 135px)';
-                QV('MainMenuSpan', false); */
                 QV('UserDummyMenuSpan', (xxcurrentView < 10) && webPageFullScreen);
-                QV('page_leftbar', !(hide & 16));
             }
-            //center();
             masterUpdate(512);
             QV('body', true);
         }
@@ -1449,7 +1453,7 @@
                 case 'getcookie': {
                     if (message.tag == 'clickonce') {
                         var basicPort = "{{{serverRedirPort}}}" == "" ? "{{{serverPublicPort}}}" : "{{{serverRedirPort}}}";
-                        var rdpurl = "http://" + window.location.hostname + ":" + basicPort + "/clickonce/minirouter/MeshMiniRouter.application?WS=wss%3A%2F%2F" + window.location.hostname + "%2Fmeshrelay.ashx%3Fauth=" + message.cookie + "&CH={{{webcerthash}}}&AP=" + message.protocol + ((debugmode == 1) ? "" : "&HOL=1");
+                        var rdpurl = "http://" + window.location.hostname + ":" + basicPort + "/clickonce/minirouter/MeshMiniRouter.application?WS=wss%3A%2F%2F" + window.location.hostname + "%2Fmeshrelay.ashx%3Fauth=" + message.cookie + "&CH={{{webcerthash}}}&AP=" + message.protocol + ((debugmode == 1) ? "" : "&XHOL=1");
                         var newWindow = window.open(rdpurl, '_blank');
                         newWindow.opener = null;
                     }
@@ -1945,6 +1949,7 @@
             putstore("deviceView", Q('viewselect').value);
             putstore("viewsize", Q('sizeselect').value);
             masterUpdate(4);
+            setTimeout("masterUpdate(512)", 200);
         }
 
         function ondockeypress(e) {
@@ -2342,7 +2347,7 @@
                                 multiDesktop[id] = desktop;
                                 desktop = desktopNode = currentNode = null;
                                 // Setup a replacement desktop
-                                QH('DeskParent', '<canvas id="Desk" width="640" height="480" style="width:100%;-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
+                                QH('DeskParent', '<canvas id="Desk" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
                             } else {
                                 // This is a new device, create a canvas for it.
                                 var c = document.createElement('canvas');
@@ -3796,7 +3801,6 @@
                 Q('p14iframe').contentWindow.setConnectionState(online);
                 Q('p14iframe').contentWindow.setFrameHeight('650px');
                 Q('p14iframe').contentWindow.setAuthCallback(updateAmtCredentials);
-                if (args['idertrace']) { Q('p14iframe').contentWindow.setUrlVar('idertrace', args['idertrace']); }
 
                 // Display "action" button on desktop/terminal/files
                 QV('deskActionsBtn', (meshrights & 72) != 0); // 72 = Wake-up + Remote Control permissions
@@ -4175,7 +4179,7 @@
         var showEditNodeValueDialog_modes3 = ['', '', '', 'Tag1, Tag2, Tag3'];
         function showEditNodeValueDialog(mode) {
             if (xxdialogMode) return;
-            var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue style=width:230px maxlength=64 placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) />');
+            var x = addHtmlValue(showEditNodeValueDialog_modes[mode], '<input id=dp10devicevalue maxlength=64 placeholder="' + showEditNodeValueDialog_modes3[mode] + '" onchange=p10editdevicevalueValidate(' + mode + ',event) onkeyup=p10editdevicevalueValidate(' + mode + ',event) />');
             setDialogMode(2, "Edit Device", 3, showEditNodeValueDialogEx, x, mode);
             var v = currentNode[showEditNodeValueDialog_modes2[mode]];
             if (v == null) v = '';
@@ -4214,7 +4218,6 @@
                     QH('DeskParent', '');
                     var c = xdesk.m.CanvasId;
                     c.setAttribute('id', 'Desk');
-                    c.setAttribute('style', 'width:100%;-ms-touch-action:none;margin-left:0px');
                     c.setAttribute('onmousedown', 'dmousedown(event)');
                     c.setAttribute('onmouseup', 'dmouseup(event)');
                     c.setAttribute('onmousemove', 'dmousemove(event)');
@@ -4228,7 +4231,7 @@
                     delete multiDesktop[currentNode._id];
                 } else {
                     // Device is not already connected, just setup a blank canvas
-                    QH('DeskParent', '<canvas id=Desk width=640 height=480 style="width:100%;-ms-touch-action:none;margin-left:0px" oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
+                    QH('DeskParent', '<canvas id=Desk oncontextmenu="return false" onmousedown=dmousedown(event) onmouseup=dmouseup(event) onmousemove=dmousemove(event)></canvas>');
                     desktopNode = currentNode;
                 }
                 // Setup the mouse wheel
@@ -4524,45 +4527,19 @@
         var browserfullscreen = false;
         function deskToggleFull(e) {
             fullscreen = !fullscreen;
-            /* QV('mastheadx', !fullscreen);
-            QV('masthead', !fullscreen);
-            QV('topbar', !fullscreen); 
-            QV('p11deviceNameHeader', !fullscreen);
-            QV('footer', !fullscreen);
-            QV('column_l_bottomgap', !fullscreen);
-            QV('idx_deskFullBtn2', fullscreen);
-            QV('deskFullBtn', !fullscreen);
-            QV('page_leftbar', !fullscreen); */
             if (fullscreen) {
                 QC('body').add("fulldesk");
+                QS('deskarea3x').height = null;
                 // If shift is pressed, enter browser full screen.
                 if (e.shiftKey == true) { enterBrowserFullscreen(Q('deskarea0')); browserfullscreen = true; }
-                /* QS('column_l').width = '930px';
-                QS('column_l').height = '';
-                QS('column_l')['margin-left'] = '';
-                QS('column_l')['overflow-y'] = '';
-                QS('container').position = '';
-                QS('page_content').position = '';
-                QV('MainMenuSpan', true);
-                QS('container').width = '100%';
-                QS('container')['border-right'] = '0';
-                QS('container')['border-left'] = '0';
-                QS('column_l').padding = '0';
-                QS('column_l').width = '100%';
-                QS('column_l')["max-height"] = ''; */
             } else {
                 QC('body').remove("fulldesk");
                 exitBrowserFullscreen();
                 browserfullscreen = false;
-                /* QS('container').width = '960px';
-                QS('container')['border-right'] = '1px solid #b7b7b7';
-                QS('container')['border-left'] = '1px solid #b7b7b7';
-                QS('column_l').padding = '0 15px';
-                QS('column_l').width = '930px'; */
                 toggleFullScreen();
             }
             deskAdjust();
-            deskAdjust();
+            //deskAdjust();
             updateDesktopButtons();
         }
 
@@ -4572,33 +4549,34 @@
         }
 
         function deskAdjust() {
-            var x = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('Desk').clientHeight + Q('deskarea4').clientHeight + 2)) / 2;
+            if (deskAspectRatio) {
-            if (fullscreen) {
+                QS('Desk').width = '100%';
-                document.documentElement.style.overflow = 'hidden';
+                QS('Desk').height = '100%';
                 QS('deskarea3x').height = null;
-                if (x < 0) {
-                    var mh = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (Q('deskarea1').clientHeight + Q('deskarea2').clientHeight + Q('deskarea4').clientHeight));
-                    var mw = 9999;
-                    if (desktop) { mw = (desktop.m.width / desktop.m.height) * mh; }
-                    if (webRtcDesktop && webRtcDesktop.softdesktop) { mw = (webRtcDesktop.softdesktop.m.width / webRtcDesktop.softdesktop.m.height) * mh; }
-                    QS('Desk')['max-height'] = mh + 'px';
-                    QS('Desk')['max-width'] = mw + 'px';
-                    x = 0;
             } else {
-                    QS('Desk')['max-height'] = null;
+                var parentH = Q('DeskParent').clientHeight;
-                    QS('Desk')['max-width'] = null;
+                var parentW = Q('DeskParent').clientWidth;
+                var deskH = Q('Desk').height;
+                var deskW = Q('Desk').width;
+                if (parentH / parentW > deskH / deskW) {
+                    var hNew = (deskH * parentW / deskW) + 'px';
+                    if (webPageFullScreen || fullscreen) {
+                        QS('deskarea3x').height = null;
+                    } else {
+                        // QS('deskarea3x').height = hNew;
+                        QS('deskarea3x').height = null;
                     }
-                QS('Desk')['margin-top'] = x + 'px';
+                    QS('Desk').height = hNew;
-                QS('Desk')['margin-bottom'] = x + 'px';
+                    QS('Desk').width = '100%';
                 } else {
-                var mw = 9999, mh = (Math.max(document.documentElement.clientHeight, window.innerHeight || 0) - (webPageFullScreen?276:290));
+                    var wNew = (deskW * parentH / deskH) + 'px';
-                if (desktop) { mw = (desktop.m.width / desktop.m.height) * mh; }
+                    if (webPageFullScreen || fullscreen) {
-                if (webRtcDesktop && webRtcDesktop.softdesktop) { mw = (webRtcDesktop.softdesktop.m.width / webRtcDesktop.softdesktop.m.height) * mh; }
+                        QS('Desk').height = null;
-                document.documentElement.style.overflow = 'auto';
+                    } else {
-                QS('Desk')['max-height'] = mh + 'px';
+                        QS('Desk').height = '100%';
-                QS('Desk')['max-width'] = mw + 'px';
+                    }
-                QS('Desk')['margin-top'] = '0';
+                    QS('Desk').width = wNew;
-                QS('Desk')['margin-bottom'] = '0';
+                }
             }
         }
 
@@ -7547,6 +7525,7 @@
         // Display a dialog box
         // Parameters: Dialog Mode (0 = none), Dialog Title, Buttons (1 = OK, 2 = Cancel, 3 = OK & Cancel), Call back function(0 = Cancel, 1 = OK), Dialog Content (Mode 2 only)
         function setDialogMode(x, y, b, f, c, tag) {
+            QV('uiMenu', false);
             xxdialogMode = x;
             xxdialogFunc = f;
             xxdialogButtons = b;
@@ -7570,7 +7549,7 @@
         }
 
         function center() {
-            if (xxcurrentView == 11) { deskAdjust(); } //deskAdjust(); }
+            if (xxcurrentView == 11) { deskAdjust(); }
             else if (xxcurrentView == 10) { masterUpdate(256); }
             else if (xxcurrentView == 1) { masterUpdate(4); }
         }
@@ -7579,6 +7558,7 @@
 
         function goBack() {
             if (xxdialogMode) return;
+            if (fullscreen) { deskToggleFull(); }
             if ((xxcurrentView >= 10) && (xxcurrentView < 20)) { go(1); } // Return to My Devices
             if ((xxcurrentView >= 20) && (xxcurrentView < 30)) { go(2); } // Return to My Account
             if ((xxcurrentView >= 30) && (xxcurrentView < 40)) { go(4); } // Return to My Users
@@ -7586,6 +7566,8 @@
 
         function go(x) {
             if (xxdialogMode || xxcurrentView == x) return;
+            QV('uiMenu', false);
+
             // Edit this line when adding a new screen
             for (var i = 0; i < 41; i++) { QV('p' + i, i == x); }
             xxcurrentView = x;
@@ -7643,14 +7625,6 @@
             QV('topbar', x != 0);
             if ((x == 0) && (webPageFullScreen)) {
                 QC('body').add("arg_hide");
-                QS('column_l').height = 'calc(100vh - 111px)';
-
-                // Please check. I think this part is not needed anymore. Removing class will revert to default style
-                //QS('page_content').position = '';
-                //QV('page_leftbar', false);
-                //QS('column_l')["max-height"] = '';
-                //QV('column_l').left = 0;
-                //QV('page_content').left = 0;
             }
 
             QV('MainSubMenuSpan', x >= 10 && x < 20);

views/login.handlebars

@@ -11,18 +11,23 @@
     <script keeplink=1 type="text/javascript" src="scripts/u2f-api.js"></script>
     <title>{{{title}}} - Login</title>
 </head>
-<body id="body" onload="if (typeof(startup) !== 'undefined') startup();" class="arg_hide">
+<body id="body" onload="if (typeof(startup) !== 'undefined') startup();" class="arg_hide login">
     <div id=container>
-        <div id=mastheadx></div>
         <div id=masthead>
             <div class="title">{{{title}}}</div>
             <div class="title2">{{{title2}}}</div>
         </div>
-        <div id=page_content>
+            <div id=topbar class="noselect style3" style="height:24px">
-            <div id=topbar class="noselect style3">
+                <div id=uiMenuButton title="User interface selection" onclick="showUserInterfaceSelectMenu()">
-                <div id=toggle title="Toggle full width" onclick="toggleFullScreen(1)">&harr;</div>
+                    &diams;
+                    <div id=uiMenu style="display:none">
+                        <div id=uiViewButton1 class=uiSelector onclick=userInterfaceSelectMenu(1) title="Left bar interface"><div class="uiSelector1"></div></div>
+                        <div id=uiViewButton2 class=uiSelector onclick=userInterfaceSelectMenu(2) title="Top bar interface"><div class="uiSelector2"></div></div>
+                        <div id=uiViewButton3 class=uiSelector onclick=userInterfaceSelectMenu(3) title="Fixed width interface"><div class="uiSelector3"></div></div>
                     </div>
-            <div id=column_l style="height:calc(100vh - 111px)">
+                </div>
+            </div>
+            <div id=column_l>
                 <h1>Welcome</h1>
                 <div id="welcomeText" style="display:none">Connect to your home or office devices from anywhere in the world using <a href="http://www.meshcommander.com/meshcentral2">MeshCentral</a>, the real time, open source remote monitoring and management web site. You will need to download and install a management agent on your computers. Once installed, computers will show up in the &quot;My Devices&quot; section of this web site and you will be able to monitor them and take control of them.</div>
                 <table id="centralTable" style="">
@@ -216,7 +221,7 @@
                     &nbsp;<a href=terms>Terms &amp; Privacy</a>
                 </div>
             </div>
-        </div>
+        
     </div>
     <div id=dialog style="display:none">
         <div id=dialogHeader>
@@ -247,12 +252,14 @@
         if (passRequirements != "") { passRequirements = JSON.parse(decodeURIComponent(passRequirements)); } else { passRequirements = {}; }
         var passRequirementsEx = ((passRequirements.min != null) || (passRequirements.max != null) || (passRequirements.upper != null) || (passRequirements.lower != null) || (passRequirements.numeric != null) || (passRequirements.nonalpha != null));
         var features = parseInt('{{{features}}}');
-        var webPageFullScreen = getstore('webPageFullScreen', true);
-        if (webPageFullScreen == 'false') { webPageFullScreen = false; }
-        if (webPageFullScreen == 'true') { webPageFullScreen = true; }
         var welcomeText = decodeURIComponent("{{{welcometext}}}");
         var currentpanel = 0;
-        toggleFullScreen();
+        var uiMode = parseInt(getstore('uiMode', 1));
+        var webPageFullScreen = true;
+        //var webPageFullScreen = getstore('webPageFullScreen', true);
+        //if (webPageFullScreen == 'false') { webPageFullScreen = false; }
+        //if (webPageFullScreen == 'true') { webPageFullScreen = true; }
+        //toggleFullScreen();
 
         function startup() {
             if ((features & 32) == 0) {
@@ -360,6 +367,9 @@
                     }, hardwareKeyChallenge.timeoutSeconds);
                 }
             }
+
+            // Setup the user interface in the right mode
+            userInterfaceSelectMenu();
         }
 
         function showPassHint() {
@@ -616,7 +626,7 @@
 
         // Toggle the web page to full screen
         function toggleFullScreen(toggle) {
-            if (toggle === 1) { webPageFullScreen = !webPageFullScreen; putstore('webPageFullScreen', webPageFullScreen); }
+            //if (toggle === 1) { webPageFullScreen = !webPageFullScreen; putstore('webPageFullScreen', webPageFullScreen); }
             if (webPageFullScreen == false) {
                 // By adding body class, it will change a style of all ellements using CSS selector
                 // No need for JS anymore and it will be consistent style for all the templates.
@@ -628,6 +638,23 @@
             center();
         }
 
+        // Toggle user interface menu
+        function showUserInterfaceSelectMenu() {
+            Q('uiViewButton1').classList.remove('uiSelectorSel');
+            Q('uiViewButton2').classList.remove('uiSelectorSel');
+            Q('uiViewButton3').classList.remove('uiSelectorSel');
+            try { Q('uiViewButton' + uiMode).classList.add('uiSelectorSel'); } catch (ex) { }
+            QV('uiMenu', (QS('uiMenu').display == 'none'));
+        }
+
+        function userInterfaceSelectMenu(s) {
+            if (s) { uiMode = s; putstore('uiMode', uiMode); }
+            webPageFullScreen = (uiMode < 3);
+            //webPageStackMenu = (uiMode > 1);
+            toggleFullScreen(0);
+            //toggleStackMenu(0);
+        }
+
         function center() {
             /* Now we use CSS media to achive the same effect as deleted JS  */