Cleaned up, added some more icons, and fixed some error handling