Fixed Adjacent Click method and some small issues