Add toggle for Warning on Higher volume
- some minor changes