Add please wait modal; tweak JS for tidiness