diff --git a/meshview/store.py b/meshview/store.py
index 7a7ff34..2768dd1 100644
--- a/meshview/store.py
+++ b/meshview/store.py
@@ -276,7 +276,7 @@ async def get_nodes(role=None, channel=None, hw_model=None, days_active=None):
             query = query.where(Node.last_update != "")
 
             # Order results by long_name in ascending order
-            query = query.order_by(Node.long_name.asc())
+            query = query.order_by(Node.short_name.asc())
 
             # Execute the query and retrieve results
             result = await session.execute(query)
diff --git a/meshview/templates/map.html b/meshview/templates/map.html
index db3e683..0107829 100644
--- a/meshview/templates/map.html
+++ b/meshview/templates/map.html
@@ -38,7 +38,8 @@
 {% endblock %}
 
 {% block body %}
-<div id="map" style="width: 100%; height: 600px;"></div>
+<div id="map" style="width: 100%; height: calc(100vh - 270px)"></div>
+
 <div id="filter-container">
     <input type="checkbox" class="filter-checkbox" id="filter-routers-only"> Show Routers Only
 </div>