Edit button improvement