orginze & add fields to update page