building table view refactoring more-or-less done, maybe some light cleanup