Rework banner image selection