UI changes in CLI