Applied some changes to CommandManager and ConsoleRenderer