Complete post-settings menu refactor