Environment , Credit app manager related changes

As per design document