Big post Hack Weekend refactor.

Updating the popups after the data on the settlements works, but
only for the popup open at the time the data loads (if any). This
needs more thinking about...