Reverting to normal tableview for now