Closes #402: Close yes/no modal when navigating

Clears the modal display conflicts by:
1. Closing the yes/no modal if the page changes
before the modal has a chance to display
2. Do not display the yes/no modal when the add/remove
city modal is open.