Improve ConsoleWidget