Fix Settings DOM and minor issues
Merge pull request #380 from owdqa/bug/OWDTK-379-Fix_DOM

Fix Settings DOM and minor issues