several markup and sorting changes to make it prettier