Improved display in CLI