cleaned up header and row views
more small changes & cleanup