Fix weird 'guard' error
Tweak behavior and appearence of "Next" and "Set Aside" buttons
Add a TODO note about fixing the undo issues
Spec fix: Disambiguate import buttons