Some changes in CLI tools presentation