Improve console display and interaction with modes, add control-c for console