Order 29: Build and upgrade safe house

Hey guys, i am stuck on order 29. I built the safe house, but when i upgraded it, some part of it went out of the designated zone. Now the order won't complete nor can I relocate or dismantle the safe house. Plz help.