Settings screen decoupling