Bug Fix and Remove Attachments Tab