Rearranging settings and adjust settings defaults
Also fix On the go mode