Index: trunk/web/templates/info.tmpl
===================================================================
--- trunk/web/templates/info.tmpl	(revision 145)
+++ trunk/web/templates/info.tmpl	(revision 147)
@@ -70,5 +70,5 @@
 #if not $on
     <tr><td>Ram:</td><td><input type="text" size=3 value="$machine.memory"/>MB (max $max_mem)</td></tr>
-    <tr><td>Disk:</td><td><input type="text" size=3 value="${machine.disks[0].size/1024.}"/>GB (max $max_disk)</td></tr>
+    <tr><td>Disk:</td><td><input type="text" size=3 value="${machine.disks[0].size/1024.}"/>GB (max $max_disk)</td><td>WARNING: Modifying disk size may corrupt your data.</td></tr>
 #end if
     <tr><td><input type="submit" class="button" name="action" value="Change"/></td></tr>
Index: trunk/web/templates/main.py
===================================================================
--- trunk/web/templates/main.py	(revision 145)
+++ trunk/web/templates/main.py	(revision 147)
@@ -213,5 +213,5 @@
     lines = value_string.splitlines()
     d = {}
-    for line in lines[1:]:
+    for line in lines:
         lst = line.split()
         name, id = lst[:2]
@@ -593,4 +593,5 @@
     fields = []
     machine_info = {}
+    machine_info['name'] = machine.name
     machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM'
     machine_info['owner'] = machine.owner
@@ -609,8 +610,8 @@
         if field in ('uptime', 'cputime'):
             fields.append((disp, locals()[field]))
+        elif field in machine_info:
+            fields.append((disp, machine_info[field]))
         elif field in main_status:
             fields.append((disp, main_status[field]))
-        elif field in machine_info:
-            fields.append((disp, machine_info[field]))
         else:
             pass