Putting the button back inside the span

Solving the earlier bug by detaching the button, changing the text, then
reattaching the button.