Fix table views controllers
Fix table views controllers