Added gallery function and styles
Merge branch 'staging' into 3.1