GardenCore: More work on window boxes