Combine add item and add tag windows. Closes #17