Fix race condition for #358

(Plus some minor UI tweaks)