updated code to take care of drawing issue
Merge branch 'develop_BackView' into develop