Improve Design Edit Events