Change the table view to optional
Modify some place