Major update on gallery component