Updated picks new/edit forms