Fixing bugs, adding Icons and basic i18n.
Better names for classes.