Cleaning up cells, fixing up headers, simplifying user fetch logic.