Idea for new settings layout
Settings merge

Issue #42
Issue #37