Standardise gallery templates

Make 3-column and 4-column gallery templates use same data structure and rename.
Change top software index to use 4-column gallery template.
Fix items raised in review