adding icons and changing to using some organization