Few bug fixes to click circle