Update for displaying the primary section at the top of the list and code some cleanup