Moved to group: base, fixed sorting fn, cleanedup CSS