edit button fixes