Universal Edit Button support