Catch-Up Commit
1. A few files which got missed in the last commit.
2. A fix to make moved Popup Places save their new location.
3. Combine the two alert dialogs into one dialog.