Prettier layout.
Remove unnecesary data update.
When saving an existing item, make sure to clone the item before.
When saving an existing item, make sure to clone before.