Better UI + notification alert