[DONE] Add settings and fix bugs

[SebastienCozeDev]

Before sending your pull request, make sure the following are done :

• [x] You have read our contribution guidelines.
• [x] Your PR targets the develop branch.
• [x] The title of your PR starts with [WIP] or [DONE].