Fixed the table view.
Fixed switch.
Merge remote-tracking branch 'origin/master'