Fixing order of sections and adding the details back to the map. #15 #6