Turn more links to buttons