Few edits to implement correct click on cells