Made changes to fix issue with clicking outside of the table bounds, we
were getting as IndexOutOfBoundsexception.