Index: /package_branches/invirt-web/cherrypy/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy/code/main.py	(revision 2411)
+++ /package_branches/invirt-web/cherrypy/code/main.py	(revision 2412)
@@ -300,5 +300,5 @@
                 has_vnc[m] = "WTF?"
             else:
-                has_vnc[m] = "ParaVM"+helppopup("ParaVM Console")
+                has_vnc[m] = "ParaVM"
     max_memory = validation.maxMemory(username, state)
     max_disk = validation.maxDisk(username)
@@ -557,5 +557,4 @@
                       'DISK_INFO',
                       ('state', 'state (xen format)'),
-                      ('cpu_weight', 'CPU weight'+helppopup('CPU Weight')),
                       ]
     fields = []
@@ -611,5 +610,4 @@
              max_mem=max_mem,
              max_disk=max_disk,
-             owner_help=helppopup("Owner"),
              fields = fields)
     return d
Index: /package_branches/invirt-web/cherrypy/code/templates/list.mako
===================================================================
--- /package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2411)
+++ /package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2412)
@@ -113,4 +113,6 @@
 % if has_vnc[machine] == True:
 <a href="vnc?machine_id=${machine.machine_id}">Console</a>\
+% elif has_vnc[machine] == 'ParaVM':
+ParaVM${self.fn.helppopup("ParaVM Console")}
 % elif has_vnc[machine] != 'Off':
 ${has_vnc[machine]}