Improve item edition system