Settings layout- & scrollbar issues
Merge pull request #50 from n-ctrl/master

Settings: layout- & scrollbar issues