@brianteeman good points, updated again w/ icons