Close #12 - Remove link from buttons