Worked on animating notification

Also cleaned up code