Fix merge conflict
Tweak relative col widths