diff --git a/gui-accountPage.go b/gui-accountPage.go
index 65d973b..995aa48 100644
--- a/gui-accountPage.go
+++ b/gui-accountPage.go
@@ -8,7 +8,7 @@ func makeCloudInfoBox(gw *gui.GuiWindow) {
 	log.Println("makeCloudInfoBox() START gw =", gw)
 //	box := gui.AddMainTab(gw)
 
-	gw = gui.InitGuiWindow(gui.Data.Config, "Box23", nil, gw.UiWindow, gw.UiTab)
+	gw = gui.InitGuiWindow(gui.Data.Config, "Box23", gw)
 	box := gui.AddGenericBox(gw, "makeCloudInfoBox")
 
 	log.Println("makeCloudInfoBox() START GW IS NOW: gw =", gw)
diff --git a/gui-splashPage.go b/gui-splashPage.go
index da02e9a..11fa957 100644
--- a/gui-splashPage.go
+++ b/gui-splashPage.go
@@ -70,7 +70,7 @@ func splashClick(b *gui.GuiButton) {
 		return
 	}
 	// if there is not an account, then go to 'make account'
-	gw = gui.InitGuiWindow(gui.Data.Config, "Box22", gw.MakeWindow, gw.UiWindow, gw.UiTab)
+	gw = gui.InitGuiWindow(config, "Box22", gw)
 	gw.UiTab.Delete(0)
 
 	log.Println("addSubdomainQuestionBox() START")
diff --git a/gui-vmPage.go b/gui-vmPage.go
index 10cd505..882a3f8 100644
--- a/gui-vmPage.go
+++ b/gui-vmPage.go
@@ -91,7 +91,7 @@ func createAddVmBox(b *gui.GuiButton) {
 
 	// gw.BoxMap["ADD VM" + name] = box
 
-	box := gui.CreateGenericBox(gw, b, name)
+	box := gui.AddGenericBox(gw, name)
 
 	// Add hostname entry box
 	hostname := gui.MakeEntryHbox(box, "Hostname:", "testhost", true, "Hostname")
@@ -114,7 +114,7 @@ func createVmBox(gw *gui.GuiWindow, vm *pb.Event_VM) {
 	log.Println("CreateVmBox() vm.Name =", vm.Name)
 	log.Println("CreateVmBox() gw =", gw)
 
-	box := gui.CreateBox(gw, vm.Name)
+	box := gui.AddGenericBox(gw, vm.Name)
 
 	// Add hostname entry box
 	gui.MakeEntryVbox(box, "hostname:",	vm.Hostname,			true, "Hostname")