Cleaning up alerts, a few icons, etc.
Merge pull request #57 from shayhowe/misc_cleanup

Cleaning up alerts, a few icons, etc.