Remove buttons, replace with simple links