Image fixes

Fixes for image selection in links