Some more work on gallery