reorder the main display fields as per issue #3