Progress on the settings page
Merge branch 'master' of https://github.com/Kodiak42/eqrd