diff --git a/gui-vm.go b/gui-vm.go
index 0cbda90..e45280c 100644
--- a/gui-vm.go
+++ b/gui-vm.go
@@ -72,10 +72,14 @@ func addVmsTab(box *gui.GuiBox, name string, count int, a *pb.Account) *gui.Tabl
 
 	mh   := gui.AddTableBox(box, name, count, parts)
 	xBox := gui.HardBox(box.Window, gui.Xaxis, "below mh box")
+	gw   := box.Window
 
 	makeButton(xBox, a, nil, "Add Virtual Machine", "JUNK", createAddVmBox)
 	makeButton(xBox, a, nil, "Login", "JUNK", login)
-	// makeButton(xBox, a, nil, "Configure", "JUNK", showAccountClick)
+	makeButton(xBox, a, nil, "Logout", "JUNK", func (*gui.GuiButton) {
+		gui.DeleteWindow(name)
+		makeCloudInfoBox(gw)
+	})
 	return mh
 }
 
@@ -109,7 +113,9 @@ func createAddVmBox(b *gui.GuiButton) {
 	box  = gui.HardBox(gw, gui.Xaxis, txt)
 
 	makeButton(box, values.Account, nil, "Add Virtual Machine", "CREATE", createVmClick)
-	makeButton(box, values.Account, nil, "Cancel", "CLOSE", nil)
+	makeButton(box, values.Account, nil, "Cancel", "CLOSE", func (*gui.GuiButton) {
+		gui.DeleteWindow(txt)
+	})
 }
 
 func showVmMouseClick(b *gui.GuiButton) {