Selected image loading fixed

Potential TODO, add loading gif