Improve rename button