Further edit button fix