Reviewing the way gallery links are selected. Still not final