More prettifying

Standardized some popups, but I still can't get the buttons right in the popups.

I want to at least get this off my plate before jumping into the i18n stuff.