Improving navigation in gallery's section