Fix Settings DOM and minor issues