Made several improvements to the add items feature