Added Icons and comments