Fix the remove USB so it waits until the USB is really removed rather than just timing out.

Take some delays out of the unmount code.  They aren't necessary.

Rework the conditional menu more nicely using the enabled field.