Correct persistent notification logic.
Reorganize existing settings into new pages.