Settings screen now properly works with persistence