Fixing modal closing; style tweaks, to make it more consistent & happy