Added image pop up functionality
Resolved conflict
resolved another conflict
Added image pop up