Index: Combined separate image and button links into single ones (take 2).
Merge pull request #55 from EricDunsworth/index-img-btn-links-v2

Index: Combined separate image and button links into single ones (take 2).