Added scan spinner and fixed issues on notifications.