admin - more work on picker