Fixing Invoice edit issues