YH-228: Main organization and improved user listing