Made a lot of minor changes.
Fixed table view.