Feature 434 instance edit button