Settings Commit 3

config and layout changes