#243 - Split settings model up and fix auth screen not dissappearing