Improve attachment display & update handling code