Added UI code changes