Table structure for DS settings

there are a bunch of indentation fixes required in this block