CARE #27: Fix edit view