Working on edit and view