Fix Border for 2column set

Also fixed headers possibly being converted early