Links, buttons and small fixes