Table border fix, timgs on/off. Also some merging I guess?