Clean up settings. Add dependency to make it work after merge

Change some labels