OA-436: Improve User Notification Settings UX