Multiple UI Improvements

web/react/components/user_settings/user_settings_display.jsx

@@ -240,18 +240,14 @@ export default class UserSettingsDisplay extends React.Component {
 
             const inputs = [
                 <div key='userDisplayNameOptions'>
-                    <div
-                        className='dropdown'
+                    <select
+                        className='form-control'
+                        type='text'
+                        value={this.state.selectedFont}
+                        onChange={(e) => this.handleFont(e.target.value)}
                     >
-                        <select
-                            className='form-control'
-                            type='text'
-                            value={this.state.selectedFont}
-                            onChange={(e) => this.handleFont(e.target.value)}
-                        >
-                            {options}
-                        </select>
-                    </div>
+                        {options}
+                    </select>
                     <div><br/>{'Select the font displayed in the Mattermost user interface.'}</div>
                 </div>
             ];
@@ -309,12 +305,12 @@ export default class UserSettingsDisplay extends React.Component {
                 <div className='user-settings'>
                     <h3 className='tab-header'>{'Display Settings'}</h3>
                     <div className='divider-dark first'/>
-                    {fontSection}
-                    <div className='divider-dark'/>
                     {clockSection}
                     <div className='divider-dark'/>
                     {nameFormatSection}
                     <div className='divider-dark'/>
+                    {fontSection}
+                    <div className='divider-dark'/>
                 </div>
             </div>
         );

web/react/components/user_settings/user_settings_modal.jsx

@@ -47,7 +47,7 @@ export default class UserSettingsModal extends React.Component {
     }
 
     handleShow() {
-        $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 300);
+        $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 50);
         if ($(window).width() > 768) {
             $(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar();
         }