Cleaning up some buttons and links