Fix tableView behavior - working for static table view perfectly