modularise gallery item
fix fields, modularise gallery