Working on edit view