Replace popup editing with inline editing

Delete unnecessary New/Edit popup