Added comments and displayed corresponding icon