Updated code changes for UI

Updated code changes for UI