Clean up images
Fix some notification bugs