Eliminate separate edit button