Lots o Changes

Added icons, and general beautify