updated models, views, pickset template