diff --git a/share/jupyterhub/templates/home.html b/share/jupyterhub/templates/home.html
index 17565ed4a..55f7503a5 100644
--- a/share/jupyterhub/templates/home.html
+++ b/share/jupyterhub/templates/home.html
@@ -39,12 +39,16 @@ <h2>Named Servers</h2>
         <tbody>
           <tr class="home-server-row add-server-row">
             <td colspan="4">
-              <input class="new-server-name"
-                     aria-label="server name"
-                     placeholder="name-your-server">
-              <button role="button"
-                      type="button"
-                      class="new-server-btn btn btn-xs btn-primary">Add New Server</button>
+              <div class="input-group">
+                <input
+                  class="new-server-name form-control"
+                  aria-label="server name"
+                  placeholder="name-your-server">
+                <button role="button"
+                  type="button"
+                  class="new-server-btn btn btn-xs btn-primary">Add New Server</button>
+              </div>
+
             </td>
           </tr>
           {% for spawner in named_spawners %}
diff --git a/share/jupyterhub/templates/page.html b/share/jupyterhub/templates/page.html
index 7583473b6..8a520b1f0 100644
--- a/share/jupyterhub/templates/page.html
+++ b/share/jupyterhub/templates/page.html
@@ -167,7 +167,7 @@ <h2 class="modal-title" id="{{ key }}-label">{{ title }}</h2>
                   {% block login_widget %}
                     <span id="login_widget">
                       {% if user %}
-                        <span class="navbar-text">{{ user.name }}</span>
+                        <span class="navbar-text me-1">{{ user.name }}</span>
                         <a id="logout"
                            role="button"
                            class="btn btn-sm btn-outline-dark"