completed changes for gui