Redesign the command line a little.