Revert "Removed label, sorting, fixed first modifier"

This reverts commit 09def097a73a266ae419bd544335dc4628514db3.