Refactor gallery from Arkive