TableViewControlled removed and minor fixes