Agpush 793

No longer uses artificial grouping to display the variants but sorts them on type on the backend. Also changed the variant type name to be the same everywhere.
To have a sorted list change the type from Set to List