Improve formatting on non-xterm terminals