Image addition UI v1
Merge conflict resolved