Fixed overflow issue in attachment list
Fixed duplicate entry issue