Added icons and corrected some bugs