Adjustments in the TableView and its controller