Add edit view and correct navigation