modularizing most of the table view.
fixing conflicts