Adding "end of the line" icons and logic