2 columns for buttons and image gallery links
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'