Border color improvements and cell deselection add