Dynamic add and edit finished