Refactor more partial edit view. DHH-104