rework folder_picker and related calls to just use model. simplifies some things, but does not fix the account change bug