- tryout new settings layout 2
Merge origin/master