Index: package_branches/invirt-web/cherrypy/code/templates/command.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/command.mako	(revision 2418)
+++ package_branches/invirt-web/cherrypy/code/templates/command.mako	(revision 2418)
@@ -0,0 +1,9 @@
+<%page expression_filter="h" />
+<%inherit file="skeleton.mako" />
+
+<%def name="title()">
+$command ${machine.name}
+</%def>
+
+<p>${command} ${machine.name} was successful.</p>
+<p><a href="list">Return</a></p>
Index: package_branches/invirt-web/cherrypy/code/templates/command.tmpl
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/command.tmpl	(revision 2417)
+++ 	(revision )
@@ -1,16 +1,0 @@
-#from skeleton import skeleton
-#extends skeleton
-
-#def title
-$command $machine.name
-#end def
-
-
-#def body
-<p>$command ${machine.name} was successful.</p>
-#if $command == "Delete VM" or True
-<p><a href="list">Return</a></p>
-#else
-<p><a href="info?machine_id=${machine.machine_id}">Return</a></p>
-#end if
-#end def
Index: package_branches/invirt-web/cherrypy/code/templates/info.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/info.mako	(revision 2417)
+++ package_branches/invirt-web/cherrypy/code/templates/info.mako	(revision 2418)
@@ -29,5 +29,5 @@
 <%def name="command_button(title, value, cdrom=False, extra='')">
 <form action="machine/${machine.machine_id}/command/${value}" method="POST">
-  <input type="hidden" name="back" value="machine/${machine.machine_id}/info" />
+  <input type="hidden" name="back" value="info" />
   <input type="submit" class="button" name="action" value="${title}" ${extra | n}/>
 % if cdrom:
Index: package_branches/invirt-web/cherrypy/code/templates/list.mako
===================================================================
--- package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2417)
+++ package_branches/invirt-web/cherrypy/code/templates/list.mako	(revision 2418)
@@ -85,9 +85,9 @@
       <tr> 
 	<td rowspan="2">
-	  <form action="command" method="post">
+	  <form action="machine/${machine.machine_id}/command/${'shutdown' if machine.uptime else 'create'}" method="post">
 	    <input type="hidden" name="back" value="list"/>
 	    <input type="hidden" name="machine_id"
 		   value="${machine.machine_id}"/>
-<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Power off' if machine.uptime else 'Power on'}"\
+<input type="submit" class="power ${'on' if machine.uptime else 'off'}" name="action" value="${'Shutdown' if machine.uptime else 'Power on'}"\
 % if machine.uptime:
  onclick="return confirm('Are you sure you want to power off this VM?');"