edit done for service wizard and fixed few related issues.