Integrated inline edit,
Fixed production/test configuration