Some cleanup
Make Notification Center Widget actually work properly