Fixed Circular view
fixed conflict
Merge branch 'develop' of github.com:richa-webonise/relocate into develop
fixing drag drop
fixed
fixed conflict