Revised buttons and links