Minor code cleanup
Add links to button fields