Better UI handling with actual response