Multiple fixes for file-picker navigation/selection.  Fixes #22