Improve Table View Performance

Working on the detail view now