'Model' picker dialog up & running + improvements