* Some changes to table and match view.