Rewritten more code

Also added functionality to move the complete notification.