Remove Border from trail counts and put back space around gallery counts
remove legacy trail break
Refactor trails
Merge pull request #1884 from guardian/gallery-trail-fixes

Gallery trail fixes