Moved fields to be in the overview