alex's last changes
fixed conflicts
fixing notifications page