Improved Item maker in Setup Wizard. Fixes #1501 and #1601

@pdvyas or @nabinhait can you merge this?