Resolve multiple modal backdrop weirdness and
various code improvements inline with underlying Brackets changes