Clean Up Settings Menu

Needed that after the addition of ReVolt Control