There is more to do, but this makes most of the terminal-layouts rectangular and somewhat consistent.