Proper button links (ref #212)