Fixed some database issues and some UI issues.
The notification was also being added a little to early.