Refined UI and code in AddingItem dialog