Feature/fix order of groups on overview page