Merge pull request #173 from kamalpreetgrewal/master

enables selection/moving for image entity
sets option variable for all entities and cleans code