edit view fixes