Ui Fixes settings screen
Merge remote-tracking branch 'origin/master'
more more more UI fixes