Improvments
Merge branch 'master' into feature-main-improvments
fix tests
Remove  button
Merge branch 'master' into feature-main-improvments
Merge pull request #30 from M6Web/feature-main-improvments

Main improvments