reminder settings page
fixed conflicts