Updated maps logic to show windows