replaced alerts with notifications
changed some pages height