Some More changes including double click on images