merged and refactored additem form