Latest Code change for UI

UI code change