Better UI handling for adding