Move max_lines and max_columns configuration items to top-level.

Renames the config options.