Tool Settings layout fixup